aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Topolnjak <ivantopo@gmail.com>2014-02-02 22:55:05 -0300
committerIvan Topolnjak <ivantopo@gmail.com>2014-02-02 22:55:05 -0300
commitd2f43e874f867afab55e0e76f1edd89faff85953 (patch)
tree479bfb8f710120cba3812f99ba047f05ee8e1539
parent6bdbe4c6473ac052567c097c1a7376c15dc67ea2 (diff)
downloadKamon-d2f43e874f867afab55e0e76f1edd89faff85953.tar.gz
Kamon-d2f43e874f867afab55e0e76f1edd89faff85953.tar.bz2
Kamon-d2f43e874f867afab55e0e76f1edd89faff85953.zip
instrument akka testkit to correctly propagate TraceContexts when replying from a test probe
-rw-r--r--kamon-testkit/src/main/resources/META-INF/aop.xml (renamed from kamon-core/src/test/resources/META-INF/aop.xml)4
-rw-r--r--kamon-testkit/src/main/scala/testkit/TestProbeInstrumentation.scala (renamed from kamon-core/src/test/scala/akka/testkit/TestProbeTracing.scala)2
2 files changed, 3 insertions, 3 deletions
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