diff options
Diffstat (limited to 'kamon-spray/src/main/scala')
3 files changed, 8 insertions, 16 deletions
diff --git a/kamon-spray/src/main/scala/kamon/instrumentation/SprayServerInstrumentation.scala b/kamon-spray/src/main/scala/kamon/instrumentation/SprayServerInstrumentation.scala index e0837d01..c47dbc67 100644 --- a/kamon-spray/src/main/scala/kamon/instrumentation/SprayServerInstrumentation.scala +++ b/kamon-spray/src/main/scala/kamon/instrumentation/SprayServerInstrumentation.scala @@ -19,12 +19,10 @@ import org.aspectj.lang.annotation._ import org.aspectj.lang.ProceedingJoinPoint import spray.http.HttpRequest import spray.http.HttpHeaders.Host -import kamon.trace.{TraceContext, Trace, ContextAware, TimedContextAware} +import kamon.trace.{ TraceContext, Trace, ContextAware, TimedContextAware } //import spray.can.client.HttpHostConnector.RequestContext - - @Aspect class SprayOpenRequestContextTracing { @@ -38,7 +36,6 @@ class SprayOpenRequestContextTracing { @Aspect class SprayServerInstrumentation { - @Pointcut("execution(spray.can.client.HttpHostConnector.RequestContext.new(..)) && this(ctx) && args(request, *, *, *)") def requestRecordInit(ctx: TimedContextAware, request: HttpRequest): Unit = {} @@ -51,8 +48,6 @@ class SprayServerInstrumentation { } tctx.tracer ! WebExternalStart(ctx.timestamp, host.host)*/ } - - @Pointcut("execution(* spray.can.client.HttpHostConnectionSlot.dispatchToCommander(..)) && args(requestContext, message)") def dispatchToCommander(requestContext: TimedContextAware, message: Any): Unit = {} @@ -69,7 +64,6 @@ class SprayServerInstrumentation { } - @Pointcut("execution(* spray.can.client.HttpHostConnector.RequestContext.copy(..)) && this(old)") def copyingRequestContext(old: TimedContextAware): Unit = {} diff --git a/kamon-spray/src/main/scala/kamon/spray/UowDirectives.scala b/kamon-spray/src/main/scala/kamon/spray/UowDirectives.scala index 775d93dd..b4ff1877 100644 --- a/kamon-spray/src/main/scala/kamon/spray/UowDirectives.scala +++ b/kamon-spray/src/main/scala/kamon/spray/UowDirectives.scala @@ -23,7 +23,7 @@ import java.net.InetAddress import kamon.trace.Trace trait UowDirectives extends BasicDirectives { - def uow: Directive0 = mapRequest { request => + def uow: Directive0 = mapRequest { request ⇒ val uowHeader = request.headers.find(_.name == "X-UOW") val generatedUow = uowHeader.map(_.value).getOrElse(UowDirectives.newUow) 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]") } |