From 59c01d880379dfc48c6d82da13ef628a587a9bbb Mon Sep 17 00:00:00 2001 From: Ivan Topolnjak Date: Fri, 31 Jan 2014 09:01:18 -0300 Subject: remake of trace context and allow different tracing levels --- kamon-core/src/main/scala/kamon/instrumentation/FutureTracing.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'kamon-core/src/main/scala/kamon/instrumentation/FutureTracing.scala') diff --git a/kamon-core/src/main/scala/kamon/instrumentation/FutureTracing.scala b/kamon-core/src/main/scala/kamon/instrumentation/FutureTracing.scala index b8725dd7..634c94a1 100644 --- a/kamon-core/src/main/scala/kamon/instrumentation/FutureTracing.scala +++ b/kamon-core/src/main/scala/kamon/instrumentation/FutureTracing.scala @@ -23,7 +23,7 @@ import kamon.trace.{ TraceContextAware, TraceRecorder } class FutureTracing { @DeclareMixin("scala.concurrent.impl.CallbackRunnable || scala.concurrent.impl.Future.PromiseCompletingRunnable") - def mixin: TraceContextAware = new TraceContextAware {} + def mixinTraceContextAwareToFutureRelatedRunnable: TraceContextAware = TraceContextAware.default @Pointcut("execution((scala.concurrent.impl.CallbackRunnable || scala.concurrent.impl.Future.PromiseCompletingRunnable).new(..)) && this(runnable)") def futureRelatedRunnableCreation(runnable: TraceContextAware): Unit = {} @@ -39,7 +39,7 @@ class FutureTracing { @Around("futureRelatedRunnableExecution(runnable)") def aroundExecution(pjp: ProceedingJoinPoint, runnable: TraceContextAware): Any = { - TraceRecorder.withContext(runnable.traceContext) { + TraceRecorder.withTraceContext(runnable.traceContext) { pjp.proceed() } } -- cgit v1.2.3