instrument akka testkit to correctly propagate TraceContexts when replying from a test probe

4 files changed, 14 insertions, 9 deletions

diff --git a/kamon-spray/src/test/scala/kamon/spray/ServerRequestInstrumentationSpec.scala b/kamon-spray/src/test/scala/kamon/spray/ServerRequestInstrumentationSpec.scala
index 9b4acdd9..0edf75e0 100644
--- a/kamon-spray/src/test/scala/kamon/spray/ServerRequestInstrumentationSpec.scala
+++ b/kamon-spray/src/test/scala/kamon/spray/ServerRequestInstrumentationSpec.scala
@@ -33,7 +33,7 @@ import spray.http.HttpHeaders.Host
 import akka.io.{ Tcp, IO }
 import spray.can.Http
 import akka.io.Tcp.Bound
-import kamon.metrics.{TraceMetrics, Metrics}
+import kamon.metrics.{ TraceMetrics, Metrics }
 import kamon.metrics.TraceMetrics.TraceMetricSnapshot
 import kamon.metrics.Subscriptions.TickMetricSnapshot
 
@@ -79,14 +79,13 @@ class ServerRequestInstrumentationSpec extends TestKit(ActorSystem("spec")) with
       client.expectMsgType[HttpResponse]
 
       metricListener.fishForMessage() {
-        case snapshot @ TickMetricSnapshot(_, _, metrics) => metrics.keys.exists(_.name.contains("open-and-finish"))
-        case other => false
+        case snapshot @ TickMetricSnapshot(_, _, metrics) ⇒ metrics.keys.exists(_.name.contains("open-and-finish"))
+        case other                                        ⇒ false
       }
     }
 
   }
 
-
 }
 
 trait TestServer {
diff --git a/kamon-core/src/test/resources/META-INF/aop.xml b/kamon-testkit/src/main/resources/META-INF/aop.xml
index ea8dce20..8c5cfe42 100644
--- a/kamon-core/src/test/resources/META-INF/aop.xml
+++ b/kamon-testkit/src/main/resources/META-INF/aop.xml
@@ -2,8 +2,8 @@
 
 <aspectj>
     <aspects>
-        <!-- Actors -->
-        <aspect name="akka.testkit.TestProbeTracing"/>
+        <!-- TestKit -->
+        <aspect name="akka.testkit.TestProbeInstrumentation"/>
     </aspects>
 
     <weaver options="-verbose -showWeaveInfo">
diff --git a/kamon-core/src/test/scala/akka/testkit/TestProbeTracing.scala b/kamon-testkit/src/main/scala/testkit/TestProbeInstrumentation.scala
index a050145a..de867035 100644
--- a/kamon-core/src/test/scala/akka/testkit/TestProbeTracing.scala
+++ b/kamon-testkit/src/main/scala/testkit/TestProbeInstrumentation.scala
@@ -22,7 +22,7 @@ import org.aspectj.lang.ProceedingJoinPoint
 import akka.testkit.TestActor.RealMessage
 
 @Aspect
-class TestProbeTracing {
+class TestProbeInstrumentation {
 
   @DeclareMixin("akka.testkit.TestActor.RealMessage")
   def mixin: TraceContextAware = TraceContextAware.default
diff --git a/project/Build.scala b/project/Build.scala
index c7a0fd5f..d91d9d85 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -9,7 +9,7 @@ object Build extends Build {
   import Dependencies._
 
   lazy val root = Project("root", file("."))
-    .aggregate(kamonCore, kamonSpray, kamonNewrelic, kamonPlayground, kamonDashboard)
+    .aggregate(kamonCore, kamonSpray, kamonNewrelic, kamonPlayground, kamonDashboard, kamonTestkit)
     .settings(basicSettings: _*)
     .settings(formatSettings: _*)
     .settings(noPublishing: _*)
@@ -34,7 +34,7 @@ object Build extends Build {
       libraryDependencies ++=
         compile(akkaActor, aspectJ, sprayCan, sprayClient, sprayRouting) ++
         test(scalatest, akkaTestKit, sprayTestkit))
-    .dependsOn(kamonCore)
+    .dependsOn(kamonCore, kamonTestkit)
 
 
   lazy val kamonNewrelic = Project("kamon-newrelic", file("kamon-newrelic"))
@@ -66,6 +66,12 @@ object Build extends Build {
     .settings(libraryDependencies ++= compile(akkaActor, akkaSlf4j, sprayRouting, sprayCan, sprayJson))
     .dependsOn(kamonCore)
 
+  lazy val kamonTestkit = Project("kamon-testkit", file("kamon-testkit"))
+    .settings(basicSettings: _*)
+    .settings(formatSettings: _*)
+    .settings(libraryDependencies ++= compile(akkaActor, akkaTestKit))
+    .dependsOn(kamonCore)
+
 
   lazy val site = Project("site", file("site"))
     .settings(basicSettings: _*)