diff options
author | Ivan Topolnjak <ivantopo@gmail.com> | 2014-01-31 09:01:18 -0300 |
---|---|---|
committer | Ivan Topolnjak <ivantopo@gmail.com> | 2014-01-31 09:01:18 -0300 |
commit | 49c426a635d10182e8a628353dfdf5510c4d9df2 (patch) | |
tree | a9b764090cbbf1c14973d3a3063fa776db53805d /kamon-core/src/main/scala/kamon/instrumentation | |
parent | a0a57b110a3ee4876797ab51c4758525d166796f (diff) | |
download | Kamon-49c426a635d10182e8a628353dfdf5510c4d9df2.tar.gz Kamon-49c426a635d10182e8a628353dfdf5510c4d9df2.tar.bz2 Kamon-49c426a635d10182e8a628353dfdf5510c4d9df2.zip |
remake of trace context and allow different tracing levels
Diffstat (limited to 'kamon-core/src/main/scala/kamon/instrumentation')
-rw-r--r-- | kamon-core/src/main/scala/kamon/instrumentation/ActorLoggingTracing.scala | 4 | ||||
-rw-r--r-- | kamon-core/src/main/scala/kamon/instrumentation/FutureTracing.scala | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/kamon-core/src/main/scala/kamon/instrumentation/ActorLoggingTracing.scala b/kamon-core/src/main/scala/kamon/instrumentation/ActorLoggingTracing.scala index abd3514e..954f351a 100644 --- a/kamon-core/src/main/scala/kamon/instrumentation/ActorLoggingTracing.scala +++ b/kamon-core/src/main/scala/kamon/instrumentation/ActorLoggingTracing.scala @@ -23,14 +23,14 @@ import kamon.trace.{ TraceContextAware, TraceRecorder } class ActorLoggingTracing { @DeclareMixin("akka.event.Logging.LogEvent+") - def mixin: TraceContextAware = new TraceContextAware {} + def mixinTraceContextAwareToLogEvent: TraceContextAware = TraceContextAware.default @Pointcut("execution(* akka.event.slf4j.Slf4jLogger.withMdc(..)) && args(logSource, logEvent, logStatement)") def withMdcInvocation(logSource: String, logEvent: TraceContextAware, logStatement: () ⇒ _): Unit = {} @Around("withMdcInvocation(logSource, logEvent, logStatement)") def aroundWithMdcInvocation(pjp: ProceedingJoinPoint, logSource: String, logEvent: TraceContextAware, logStatement: () ⇒ _): Unit = { - TraceRecorder.withContext(logEvent.traceContext) { + TraceRecorder.withTraceContext(logEvent.traceContext) { pjp.proceed() } } 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() } } |