Adjust tagging

README.md

@@ -42,8 +42,7 @@ class Filters extends DefaultHttpFilters(
   new DefaultTracingFilter(
     new ContentTagger,               // content headers
     new HttpVersionTagger,           // HTTP version
-    new RemoteSpanTagger,            // remote address
-    new StandardSpanTagger("myapp"), // standard OpenTracing tags
+    new StandardSpanTagger,          // standard OpenTracing tags
     new TagsSpanTagger(_ => true)    // Play request tags
   )
 )

play/src/main/scala/io/opentracing/play/StandardSpanTagger.scala

@@ -1,20 +1,28 @@
 package io.opentracing.play
 
+import com.google.common.net.InetAddresses
 import io.opentracing.Span
 import io.opentracing.tag.Tags
+import java.net.{Inet4Address, Inet6Address}
+import java.nio.ByteBuffer
 import play.api.mvc.{RequestHeader, Result}
+import scala.util.Try
 
 /**
  * Applies standard tags
  * @see https://raw.githubusercontent.com/opentracing/specification/1.0/data_conventions.yaml
  */
-class StandardSpanTagger(name: Option[String] = None) extends SpanTagger {
+class StandardSpanTagger extends SpanTagger {
   def tag(span: Span, request: RequestHeader, result: Result) = {
-    name.foreach(Tags.PEER_SERVICE.set(span, _))
     Tags.HTTP_METHOD.set(span, request.method)
     Tags.HTTP_STATUS.set(span, result.header.status)
     Tags.HTTP_URL.set(span, request.uri)
-    Tags.PEER_HOSTNAME.set(span, request.domain)
-    //Tags.PEER_PORT.set(span, request.host.split(":").lift(1).fold(if (request.secure) 443.toShort else 80.toShort)(_.toShort))
+    request.headers.get("X-Forwarded-Port").flatMap(port => Try(port.toInt.toShort).toOption)
+      .foreach(Tags.PEER_PORT.set(span, _))
+    Try(InetAddresses.forString(request.remoteAddress)).foreach {
+      case ip: Inet4Address => Tags.PEER_HOST_IPV4.set(span, ByteBuffer.wrap(ip.getAddress).getInt)
+      case ip: Inet6Address => Tags.PEER_HOST_IPV6.set(span, ip.getHostAddress.takeWhile(_ != "%"))
+    }
+
   }
 }

play/src/main/scala/io/opentracing/play/TracingFilter.scala

@@ -15,7 +15,7 @@ abstract class TracingFilter(contextSpan: ContextSpan, taggers: Traversable[Span
   protected[this] def tracer: Tracer
 
   def apply(next: EssentialAction) = EssentialAction { request =>
-    val span = tracer.buildSpan(Routes.endpointName(request).getOrElse(request.method))
+    val span = tracer.buildSpan(Routes.endpointName(request).getOrElse(s"HTTP ${request.method}"))
       .asChildOf(tracer.extract(Format.Builtin.HTTP_HEADERS, new HeadersTextMap(request.headers)))
       .withTag(Tags.SPAN_KIND.getKey, Tags.SPAN_KIND_SERVER)
       .start()

play/src/play-2.3/main/scala/io/opentracing/play/ContentTagger.scala

@@ -17,6 +17,6 @@ class ContentTagger extends SpanTagger {
 }
 
 object ContentTagger {
-  val contentLengthTag = "http.contentLength"
-  val contentTypeTag = "http.contentType"
+  val contentLengthTag = "http.response.contentLength"
+  val contentTypeTag = "http.response.contentType"
 }

play/src/play-2.5/main/scala/io/opentracing/play/ContentTagger.scala

@@ -12,6 +12,6 @@ class ContentTagger extends SpanTagger {
 }
 
 object ContentTagger extends ContentTagger {
-  val contentLengthTag = "http.contentLength"
-  val contentTypeTag = "http.contentType"
+  val contentLengthTag = "http.response.contentLength"
+  val contentTypeTag = "http.response.contentType"
 }