+ core: refactor MDC facilities and closes #100

1 files changed, 5 insertions, 2 deletions

diff --git a/kamon-core/src/main/scala/kamon/instrumentation/akka/ActorLoggingInstrumentation.scala b/kamon-core/src/main/scala/kamon/instrumentation/akka/ActorLoggingInstrumentation.scala
index 6b90a81e..e0e5d316 100644
--- a/kamon-core/src/main/scala/kamon/instrumentation/akka/ActorLoggingInstrumentation.scala
+++ b/kamon-core/src/main/scala/kamon/instrumentation/akka/ActorLoggingInstrumentation.scala
@@ -16,12 +16,13 @@
 
 package akka.kamon.instrumentation
 
+import kamon.trace.logging.MdcKeysSupport
 import kamon.trace.{ TraceContextAware, TraceRecorder }
 import org.aspectj.lang.ProceedingJoinPoint
 import org.aspectj.lang.annotation._
 
 @Aspect
-class ActorLoggingInstrumentation {
+class ActorLoggingInstrumentation extends MdcKeysSupport {
 
   @DeclareMixin("akka.event.Logging.LogEvent+")
   def mixinTraceContextAwareToLogEvent: TraceContextAware = TraceContextAware.default
@@ -41,7 +42,9 @@ class ActorLoggingInstrumentation {
   @Around("withMdcInvocation(logSource, logEvent, logStatement)")
   def aroundWithMdcInvocation(pjp: ProceedingJoinPoint, logSource: String, logEvent: TraceContextAware, logStatement: () ⇒ _): Unit = {
     TraceRecorder.withInlineTraceContextReplacement(logEvent.traceContext) {
-      pjp.proceed()
+      withMdc {
+        pjp.proceed()
+      }
     }
   }
 }