diff options
5 files changed, 136 insertions, 1 deletions
diff --git a/kamon-spray/src/main/scala/spray/can/client/ClientRequestTracing.scala b/kamon-spray/src/main/scala/spray/can/client/ClientRequestTracing.scala new file mode 100644 index 00000000..e81dc0a4 --- /dev/null +++ b/kamon-spray/src/main/scala/spray/can/client/ClientRequestTracing.scala @@ -0,0 +1,96 @@ +/* =================================================== + * Copyright © 2013 the kamon project <http://kamon.io/> + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ========================================================== */ + +package spray.can.client + +import org.aspectj.lang.annotation._ +import org.aspectj.lang.ProceedingJoinPoint +import spray.http.HttpRequest +import spray.http.HttpHeaders.Host +import kamon.trace._ +import spray.http.HttpRequest +import kamon.trace.TraceContext +import kamon.trace.Segments.{HttpClientRequest, Start} +import kamon.trace.Trace.SegmentCompletionHandle + +trait SegmentCompletionHandleAware { + var completionHandle: Option[SegmentCompletionHandle] +} + +trait ContextAndSegmentCompletionAware extends ContextAware with SegmentCompletionHandleAware + +@Aspect +class SprayOpenRequestContextTracing { + + @DeclareMixin("spray.can.client.HttpHostConnector.RequestContext") + def mixinContextAwareToRequestContext: ContextAndSegmentCompletionAware = new ContextAndSegmentCompletionAware { + def traceContext: Option[TraceContext] = Trace.context() + var completionHandle: Option[SegmentCompletionHandle] = None + } +} + +@Aspect +class SprayServerInstrumentation { + + @Pointcut("execution(spray.can.client.HttpHostConnector.RequestContext.new(..)) && this(ctx) && args(request, *, *, *)") + def requestRecordInit(ctx: ContextAndSegmentCompletionAware, request: HttpRequest): Unit = {} + + @After("requestRecordInit(ctx, request)") + def whenCreatedRequestRecord(ctx: ContextAndSegmentCompletionAware, request: HttpRequest): Unit = { + val completionHandle = Trace.startSegment(Segments.Start(HttpClientRequest)) + + // Necessary to force the initialization of TracingAwareRequestContext at the moment of creation. + ctx.traceContext + ctx.completionHandle = Some(completionHandle) + } + + @Pointcut("execution(* spray.can.client.HttpHostConnectionSlot.dispatchToCommander(..)) && args(requestContext, message)") + def dispatchToCommander(requestContext: TimedContextAware, message: Any): Unit = {} + + @Around("dispatchToCommander(requestContext, message)") + def aroundDispatchToCommander(pjp: ProceedingJoinPoint, requestContext: ContextAndSegmentCompletionAware, message: Any) = { + println("Completing the request with context: " + requestContext.traceContext) + + requestContext.completionHandle.map(_.complete(Segments.End())) + /*Tracer.context.withValue(requestContext.traceContext) { + requestContext.traceContext.map { + tctx => //tctx.tracer ! WebExternalFinish(requestContext.timestamp) + } + pjp.proceed() + }*/ + + } + + @Pointcut("execution(* spray.can.client.HttpHostConnector.RequestContext.copy(..)) && this(old)") + def copyingRequestContext(old: TimedContextAware): Unit = {} + + @Around("copyingRequestContext(old)") + def aroundCopyingRequestContext(pjp: ProceedingJoinPoint, old: TimedContextAware) = { + println("Instrumenting the request context copy.") + /*Tracer.traceContext.withValue(old.traceContext) { + pjp.proceed() + }*/ + } +} + +@Aspect +class SprayRequestContextTracing { + + @DeclareMixin("spray.can.client.HttpHostConnector.RequestContext") + def mixin: ContextAware = new ContextAware { + val traceContext: Option[TraceContext] = Trace.context() + } +}
\ No newline at end of file diff --git a/kamon-trace/src/main/scala/kamon/trace/Segments.scala b/kamon-trace/src/main/scala/kamon/trace/Segments.scala new file mode 100644 index 00000000..0e1778bf --- /dev/null +++ b/kamon-trace/src/main/scala/kamon/trace/Segments.scala @@ -0,0 +1,30 @@ +/* =================================================== + * Copyright © 2013 the kamon project <http://kamon.io/> + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ========================================================== */ + +package kamon.trace + +object Segments { + + trait Category + case object HttpClientRequest extends Category + + case class Start(category: Category, description: String = "", + attributes: Map[String, String] = Map(), timestamp: Long = System.nanoTime()) + + case class End(attributes: Map[String, String] = Map(), timestamp: Long = System.nanoTime()) + + case class Segment(start: Start, end: End) +} diff --git a/kamon-trace/src/main/scala/kamon/trace/Trace.scala b/kamon-trace/src/main/scala/kamon/trace/Trace.scala index 05519067..02947dd6 100644 --- a/kamon-trace/src/main/scala/kamon/trace/Trace.scala +++ b/kamon-trace/src/main/scala/kamon/trace/Trace.scala @@ -60,6 +60,14 @@ object Trace extends ExtensionId[TraceExtension] with ExtensionIdProvider { // TODO: FIX def newTraceContext(name: String)(implicit system: ActorSystem): TraceContext = TraceContext(Kamon(Trace), tranid.getAndIncrement, name) + + def startSegment(start: Segments.Start): SegmentCompletionHandle = SegmentCompletionHandle(start) + + case class SegmentCompletionHandle(start: Segments.Start) { + def complete(end: Segments.End): Unit = { + println(s"Completing the Segment: $start - $end") + } + } } class TraceExtension(system: ExtendedActorSystem) extends Kamon.Extension { diff --git a/kamon-trace/src/main/scala/kamon/trace/TraceContext.scala b/kamon-trace/src/main/scala/kamon/trace/TraceContext.scala index eee3e0b0..3698cea1 100644 --- a/kamon-trace/src/main/scala/kamon/trace/TraceContext.scala +++ b/kamon-trace/src/main/scala/kamon/trace/TraceContext.scala @@ -23,7 +23,7 @@ import kamon.Kamon import kamon.trace.UowTracing.{ Finish, Start } // TODO: Decide if we need or not an ID, generating it takes time and it doesn't seem necessary. -protected[kamon] case class TraceContext(private val collector: ActorRef, id: Long, uow: String = "", userContext: Option[Any] = None) { +case class TraceContext(private val collector: ActorRef, id: Long, uow: String = "", userContext: Option[Any] = None) { def start(name: String) = collector ! Start(id, name) diff --git a/kamon-trace/src/main/scala/kamon/trace/UowTracing.scala b/kamon-trace/src/main/scala/kamon/trace/UowTracing.scala index 3d1a7778..7026569c 100644 --- a/kamon-trace/src/main/scala/kamon/trace/UowTracing.scala +++ b/kamon-trace/src/main/scala/kamon/trace/UowTracing.scala @@ -19,6 +19,7 @@ import akka.actor._ import scala.concurrent.duration.Duration import kamon.trace.UowTracing._ + sealed trait UowSegment { def id: Long def timestamp: Long |