diff options
| author | Ivan Topolnjak <ivantopo@gmail.com> | 2013-11-23 22:54:47 -0300 |
|---|---|---|
| committer | Ivan Topolnjak <ivantopo@gmail.com> | 2013-11-23 22:54:47 -0300 |
| commit | 7298ddee182f08f7232e8daf8e628b089678f77b (patch) | |
| tree | 126a64b1e63637ed3b052f7f92b7252350e12a54 /kamon-trace/src/main | |
| parent | ddb000a4510dfce20f7090ac92ea9144403addd6 (diff) | |
| download | Kamon-7298ddee182f08f7232e8daf8e628b089678f77b.tar.gz Kamon-7298ddee182f08f7232e8daf8e628b089678f77b.tar.bz2 Kamon-7298ddee182f08f7232e8daf8e628b089678f77b.zip | |
simple test for ActorLogging instrumentation
Diffstat (limited to 'kamon-trace/src/main')
| -rw-r--r-- | kamon-trace/src/main/resources/META-INF/aop.xml | 1 | ||||
| -rw-r--r-- | kamon-trace/src/main/scala/kamon/trace/instrumentation/ActorLoggingTracing.scala (renamed from kamon-trace/src/main/scala/kamon/trace/instrumentation/ActorLoggingInstrumentation.scala) | 7 |
2 files changed, 4 insertions, 4 deletions
diff --git a/kamon-trace/src/main/resources/META-INF/aop.xml b/kamon-trace/src/main/resources/META-INF/aop.xml index 090cac42..fb13360a 100644 --- a/kamon-trace/src/main/resources/META-INF/aop.xml +++ b/kamon-trace/src/main/resources/META-INF/aop.xml @@ -4,6 +4,7 @@ <aspects> <aspect name="kamon.trace.instrumentation.EnvelopeTraceContextMixin"/> <aspect name="kamon.trace.instrumentation.BehaviourInvokeTracing"/> + <aspect name="kamon.trace.instrumentation.ActorLoggingTracing"/> <aspect name="kamon.trace.instrumentation.FutureTracing" /> diff --git a/kamon-trace/src/main/scala/kamon/trace/instrumentation/ActorLoggingInstrumentation.scala b/kamon-trace/src/main/scala/kamon/trace/instrumentation/ActorLoggingTracing.scala index fecdc7e3..9a9460b7 100644 --- a/kamon-trace/src/main/scala/kamon/trace/instrumentation/ActorLoggingInstrumentation.scala +++ b/kamon-trace/src/main/scala/kamon/trace/instrumentation/ActorLoggingTracing.scala @@ -6,17 +6,16 @@ import org.slf4j.MDC import kamon.trace.{TraceContext, ContextAware, Trace} @Aspect -class ActorLoggingInstrumentation { - +class ActorLoggingTracing { @DeclareMixin("akka.event.Logging.LogEvent+") - def traceContextMixin: ContextAware = ContextAware.default + def mixin: ContextAware = ContextAware.default @Pointcut("execution(* akka.event.slf4j.Slf4jLogger.withMdc(..)) && args(logSource, logEvent, logStatement)") def withMdcInvocation(logSource: String, logEvent: ContextAware, logStatement: () => _): Unit = {} @Around("withMdcInvocation(logSource, logEvent, logStatement)") - def putTraceContextInMDC(pjp: ProceedingJoinPoint, logSource: String, logEvent: ContextAware, logStatement: () => _): Unit = { + def aroundWithMdcInvocation(pjp: ProceedingJoinPoint, logSource: String, logEvent: ContextAware, logStatement: () => _): Unit = { logEvent.traceContext match { case Some(ctx) => MDC.put("uow", ctx.uow) |