aboutsummaryrefslogtreecommitdiff
path: root/kamon-core/src/test/scala
diff options
context:
space:
mode:
authorIvan Topolnak <itopolnak@despegar.com>2014-01-30 18:23:33 -0300
committerIvan Topolnak <itopolnak@despegar.com>2014-01-30 18:23:33 -0300
commita0a57b110a3ee4876797ab51c4758525d166796f (patch)
tree6da0606b82ace548ed1a76f9d2cfac309723ba1e /kamon-core/src/test/scala
parent8cb7b204bfd77cef8535b467798d88b1aa0c6d24 (diff)
downloadKamon-a0a57b110a3ee4876797ab51c4758525d166796f.tar.gz
Kamon-a0a57b110a3ee4876797ab51c4758525d166796f.tar.bz2
Kamon-a0a57b110a3ee4876797ab51c4758525d166796f.zip
wip
Diffstat (limited to 'kamon-core/src/test/scala')
-rw-r--r--kamon-core/src/test/scala/akka/testkit/TestProbeTracing.scala12
1 files changed, 6 insertions, 6 deletions
diff --git a/kamon-core/src/test/scala/akka/testkit/TestProbeTracing.scala b/kamon-core/src/test/scala/akka/testkit/TestProbeTracing.scala
index dbbf1246..c681e921 100644
--- a/kamon-core/src/test/scala/akka/testkit/TestProbeTracing.scala
+++ b/kamon-core/src/test/scala/akka/testkit/TestProbeTracing.scala
@@ -17,7 +17,7 @@
package akka.testkit
import org.aspectj.lang.annotation._
-import kamon.trace.{ ContextAware, Trace }
+import kamon.trace.{ TraceContextAware, TraceRecorder }
import org.aspectj.lang.ProceedingJoinPoint
import akka.testkit.TestActor.RealMessage
@@ -25,13 +25,13 @@ import akka.testkit.TestActor.RealMessage
class TestProbeTracing {
@DeclareMixin("akka.testkit.TestActor.RealMessage")
- def mixin: ContextAware = ContextAware.default
+ def mixin: TraceContextAware = TraceContextAware.default
@Pointcut("execution(akka.testkit.TestActor.RealMessage.new(..)) && this(ctx)")
- def realMessageCreation(ctx: ContextAware): Unit = {}
+ def realMessageCreation(ctx: TraceContextAware): Unit = {}
@After("realMessageCreation(ctx)")
- def afterRealMessageCreation(ctx: ContextAware): Unit = {
+ def afterRealMessageCreation(ctx: TraceContextAware): Unit = {
// Necessary to force the initialization of ContextAware at the moment of creation.
ctx.traceContext
}
@@ -42,11 +42,11 @@ class TestProbeTracing {
@Around("testProbeReply(testProbe)")
def aroundTestProbeReply(pjp: ProceedingJoinPoint, testProbe: TestProbe): Any = {
val traceContext = testProbe.lastMessage match {
- case msg: RealMessage ⇒ msg.asInstanceOf[ContextAware].traceContext
+ case msg: RealMessage ⇒ msg.asInstanceOf[TraceContextAware].traceContext
case _ ⇒ None
}
- Trace.withContext(traceContext) {
+ TraceRecorder.withContext(traceContext) {
pjp.proceed
}
}