From 31d38ce1564cb772a814010b9f832180649a3537 Mon Sep 17 00:00:00 2001
From: Ivan Topolnjak <ivantopo@gmail.com>
Date: Sun, 26 Oct 2014 02:21:11 +0200
Subject: = all: upgrade to be compatible with the latest code in core

---
 kamon-testkit/src/main/scala/testkit/TestProbeInstrumentation.scala | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'kamon-testkit/src/main/scala')

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) {
-- 
cgit v1.2.3