simple test for ActorLogging instrumentation

8 files changed, 43 insertions, 9 deletions

diff --git a/kamon-core/src/main/resources/META-INF/aop.xml b/kamon-core/src/main/resources/META-INF/aop.xml
index d1df0450..fe9db3e4 100644
--- a/kamon-core/src/main/resources/META-INF/aop.xml
+++ b/kamon-core/src/main/resources/META-INF/aop.xml
@@ -7,7 +7,7 @@
 
     <aspects>
         <aspect name="kamon.instrumentation.ActorSystemInstrumentation"/>
-        <aspect name="kamon.trace.instrumentation.ActorLoggingInstrumentation"/>
+
         <aspect name="akka.pattern.tracing.AskPatternTracing"/>
         <!--<aspect name="kamon.instrumentation.MessageQueueInstrumentation" />-->
         <!--<aspect name="kamon.instrumentation.InceptionAspect"/>-->
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)
diff --git a/kamon-trace/src/test/scala/kamon/trace/instrumentation/ActorLoggingSpec.scala b/kamon-trace/src/test/scala/kamon/trace/instrumentation/ActorLoggingSpec.scala
new file mode 100644
index 00000000..896faf69
--- /dev/null
+++ b/kamon-trace/src/test/scala/kamon/trace/instrumentation/ActorLoggingSpec.scala
@@ -0,0 +1,34 @@
+package kamon.trace.instrumentation
+
+import akka.testkit.TestKit
+import org.scalatest.{Inspectors, Matchers, WordSpecLike}
+import akka.actor.{Props, ActorLogging, Actor, ActorSystem}
+import akka.event.Logging.{LogEvent}
+import kamon.trace.{ContextAware, TraceContext, Trace}
+
+class ActorLoggingSpec extends TestKit(ActorSystem("actor-logging-spec")) with WordSpecLike with Matchers with Inspectors {
+
+  "the ActorLogging instrumentation" should {
+    "attach the TraceContext (if available) to log events" in {
+      val testTraceContext = Some(TraceContext(Actor.noSender, 1))
+      val loggerActor = system.actorOf(Props[LoggerActor])
+      system.eventStream.subscribe(testActor, classOf[LogEvent])
+
+      Trace.withContext(testTraceContext) {
+        loggerActor ! "info"
+      }
+
+      expectMsgPF() {
+        case event: LogEvent =>
+          val ctxInEvent = event.asInstanceOf[ContextAware].traceContext
+          ctxInEvent should equal(testTraceContext)
+      }
+    }
+  }
+}
+
+class LoggerActor extends Actor with ActorLogging {
+  def receive = {
+    case "info" => log.info("TraceContext => {}", Trace.context())
+  }
+}
diff --git a/kamon-trace/src/test/scala/kamon/ActorMessagePassingTracingSpec.scala b/kamon-trace/src/test/scala/kamon/trace/instrumentation/ActorMessagePassingTracingSpec.scala
index 0eaf96db..441f3e47 100644
--- a/kamon-trace/src/test/scala/kamon/ActorMessagePassingTracingSpec.scala
+++ b/kamon-trace/src/test/scala/kamon/trace/instrumentation/ActorMessagePassingTracingSpec.scala
@@ -1,4 +1,4 @@
-package kamon
+package kamon.trace.instrumentation
 
 import org.scalatest.{WordSpecLike, Matchers}
 import akka.actor.{ActorRef, Actor, Props, ActorSystem}
diff --git a/kamon-trace/src/test/scala/kamon/AskPatternTracingSpec.scala b/kamon-trace/src/test/scala/kamon/trace/instrumentation/AskPatternTracingSpec.scala
index c2566725..cb18fe86 100644
--- a/kamon-trace/src/test/scala/kamon/AskPatternTracingSpec.scala
+++ b/kamon-trace/src/test/scala/kamon/trace/instrumentation/AskPatternTracingSpec.scala
@@ -1,4 +1,4 @@
-package kamon
+package kamon.trace.instrumentation
 
 import akka.testkit.TestKit
 import akka.actor.{Props, Actor, ActorSystem}
diff --git a/kamon-trace/src/test/scala/kamon/FutureTracingSpec.scala b/kamon-trace/src/test/scala/kamon/trace/instrumentation/FutureTracingSpec.scala
index 1f31d4d2..9ba98381 100644
--- a/kamon-trace/src/test/scala/kamon/FutureTracingSpec.scala
+++ b/kamon-trace/src/test/scala/kamon/trace/instrumentation/FutureTracingSpec.scala
@@ -1,4 +1,4 @@
-package kamon
+package kamon.trace.instrumentation
 
 import scala.concurrent.{ExecutionContext, Await, Promise, Future}
 import org.scalatest.{Matchers, OptionValues, WordSpec}
diff --git a/kamon-trace/src/test/scala/kamon/TraceAggregatorSpec.scala b/kamon-trace/src/test/scala/kamon/trace/instrumentation/TraceAggregatorSpec.scala
index e36246be..81f92b6e 100644
--- a/kamon-trace/src/test/scala/kamon/TraceAggregatorSpec.scala
+++ b/kamon-trace/src/test/scala/kamon/trace/instrumentation/TraceAggregatorSpec.scala
@@ -1,4 +1,4 @@
-package kamon
+package kamon.trace.instrumentation
 
 import org.scalatest.{WordSpecLike, WordSpec}
 import akka.testkit.{TestKitBase, TestKit}