diff options
author | Jakob Odersky <jakob@driver.xyz> | 2017-10-04 15:02:55 -0700 |
---|---|---|
committer | Jakob Odersky <jakob@driver.xyz> | 2017-10-04 15:02:55 -0700 |
commit | 50985bc8f889176d360d8ab1ce1d880bd4d9c766 (patch) | |
tree | 588e56c8e253a5b1b38a60d9b228e9a8f66138fb /src/main | |
parent | 87182fa750f65ac57c78c42507645b94a4541385 (diff) | |
download | tracing-50985bc8f889176d360d8ab1ce1d880bd4d9c766.tar.gz tracing-50985bc8f889176d360d8ab1ce1d880bd4d9c766.tar.bz2 tracing-50985bc8f889176d360d8ab1ce1d880bd4d9c766.zip |
Update tests
Diffstat (limited to 'src/main')
-rw-r--r-- | src/main/scala/LoggingTracer.scala | 7 | ||||
-rw-r--r-- | src/main/scala/TracingDirectives.scala | 4 |
2 files changed, 4 insertions, 7 deletions
diff --git a/src/main/scala/LoggingTracer.scala b/src/main/scala/LoggingTracer.scala index b22d22a..a3ef307 100644 --- a/src/main/scala/LoggingTracer.scala +++ b/src/main/scala/LoggingTracer.scala @@ -3,15 +3,12 @@ package xyz.driver.tracing import java.util.UUID import java.time.{Instant, ZoneId} import java.time.format.DateTimeFormatter -import akka.event.LoggingAdapter import spray.json._ -class LoggingTracer(implicit logger: LoggingAdapter) extends Tracer { +class LoggingTracer(logger: String => Unit) extends Tracer { import LoggingTracer.JsonProtocol._ - override def submit(span: Span): Unit = logger.debug( - span.toJson.compactPrint - ) + override def submit(span: Span): Unit = logger(span.toJson.compactPrint) } object LoggingTracer { diff --git a/src/main/scala/TracingDirectives.scala b/src/main/scala/TracingDirectives.scala index 2c02571..a172808 100644 --- a/src/main/scala/TracingDirectives.scala +++ b/src/main/scala/TracingDirectives.scala @@ -19,7 +19,7 @@ trait TracingDirectives { } def trace(tracer: Tracer, - name: String, + name: Option[String] = None, extraLabels: Map[String, String] = Map.empty): Directive0 = extractRequest.flatMap { request => def getHeader(name: String): Option[String] = @@ -40,7 +40,7 @@ trait TracingDirectives { ) ++ extraLabels val span = Span( - name = name, + name = name.getOrElse(request.uri.path.toString), traceId = traceId, parentSpanId = parentSpanId, labels = labels |