diff options
| author | Ivan Topolnjak <ivantopo@gmail.com> | 2014-10-26 02:21:11 +0200 |
|---|---|---|
| committer | Ivan Topolnjak <ivantopo@gmail.com> | 2014-10-26 02:21:11 +0200 |
| commit | 31d38ce1564cb772a814010b9f832180649a3537 (patch) | |
| tree | f54ed491e29e3b6bb57bd30ce38fd28393289f96 /kamon-testkit | |
| parent | 096b35f93a0bafb3b0b6932d75e8d5f087cd4b2e (diff) | |
| download | Kamon-31d38ce1564cb772a814010b9f832180649a3537.tar.gz Kamon-31d38ce1564cb772a814010b9f832180649a3537.tar.bz2 Kamon-31d38ce1564cb772a814010b9f832180649a3537.zip | |
= all: upgrade to be compatible with the latest code in core
Diffstat (limited to 'kamon-testkit')
| -rw-r--r-- | kamon-testkit/src/main/scala/testkit/TestProbeInstrumentation.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kamon-testkit/src/main/scala/testkit/TestProbeInstrumentation.scala b/kamon-testkit/src/main/scala/testkit/TestProbeInstrumentation.scala index de867035..825cc718 100644 --- a/kamon-testkit/src/main/scala/testkit/TestProbeInstrumentation.scala +++ b/kamon-testkit/src/main/scala/testkit/TestProbeInstrumentation.scala @@ -17,7 +17,7 @@ package akka.testkit import org.aspectj.lang.annotation._ -import kamon.trace.{ TraceContextAware, TraceRecorder } +import kamon.trace.{ EmptyTraceContext, TraceContextAware, TraceRecorder } import org.aspectj.lang.ProceedingJoinPoint import akka.testkit.TestActor.RealMessage @@ -43,7 +43,7 @@ class TestProbeInstrumentation { def aroundTestProbeReply(pjp: ProceedingJoinPoint, testProbe: TestProbe): Any = { val traceContext = testProbe.lastMessage match { case msg: RealMessage ⇒ msg.asInstanceOf[TraceContextAware].traceContext - case _ ⇒ None + case _ ⇒ EmptyTraceContext } TraceRecorder.withTraceContext(traceContext) { |