diff options
Diffstat (limited to 'kamon-spray/src/main/scala/spray/can')
-rw-r--r-- | kamon-spray/src/main/scala/spray/can/server/ServerRequestTracing.scala | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/kamon-spray/src/main/scala/spray/can/server/ServerRequestTracing.scala b/kamon-spray/src/main/scala/spray/can/server/ServerRequestTracing.scala index 044ba5d8..c43022d9 100644 --- a/kamon-spray/src/main/scala/spray/can/server/ServerRequestTracing.scala +++ b/kamon-spray/src/main/scala/spray/can/server/ServerRequestTracing.scala @@ -15,20 +15,18 @@ * ========================================================== */ package spray.can.server -import org.aspectj.lang.annotation.{After, Pointcut, DeclareMixin, Aspect} -import kamon.trace.{Trace, ContextAware} +import org.aspectj.lang.annotation.{ After, Pointcut, DeclareMixin, Aspect } +import kamon.trace.{ Trace, ContextAware } import spray.http.HttpRequest import akka.actor.ActorSystem import akka.event.Logging.Warning - @Aspect class ServerRequestTracing { @DeclareMixin("spray.can.server.OpenRequestComponent.DefaultOpenRequest") def mixinContextAwareToOpenRequest: ContextAware = ContextAware.default - @Pointcut("execution(spray.can.server.OpenRequestComponent$DefaultOpenRequest.new(..)) && this(openRequest) && args(*, request, *, *)") def openRequestInit(openRequest: ContextAware, request: HttpRequest): Unit = {} @@ -51,14 +49,14 @@ class ServerRequestTracing { val storedContext = openRequest.traceContext val incomingContext = Trace.finish() - for(original <- storedContext) { + for (original ← storedContext) { incomingContext match { - case Some(incoming) if original.id != incoming.id => + case Some(incoming) if original.id != incoming.id ⇒ publishWarning(s"Different ids when trying to close a Trace, original: [$original] - incoming: [$incoming]") - case Some(_) => // nothing to do here. + case Some(_) ⇒ // nothing to do here. - case None => + case None ⇒ original.finish publishWarning(s"Trace context not present while closing the Trace: [$original]") } |