From 1e7a60be32b42df1669933ca40bb8d47740fe90d Mon Sep 17 00:00:00 2001
From: Ivan Topolnjak <ivantopo@gmail.com>
Date: Mon, 25 Nov 2013 02:09:43 -0300
Subject: fix conflict between futures and spray server instrumentation

---
 .../main/scala/spray/can/server/ServerRequestTracing.scala |  2 +-
 .../src/test/scala/kamon/ServerRequestTracingSpec.scala    | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'kamon-spray')

diff --git a/kamon-spray/src/main/scala/spray/can/server/ServerRequestTracing.scala b/kamon-spray/src/main/scala/spray/can/server/ServerRequestTracing.scala
index 8055cf6b..cd7cae93 100644
--- a/kamon-spray/src/main/scala/spray/can/server/ServerRequestTracing.scala
+++ b/kamon-spray/src/main/scala/spray/can/server/ServerRequestTracing.scala
@@ -1,7 +1,7 @@
 package spray.can.server
 
 import org.aspectj.lang.annotation.{After, Pointcut, DeclareMixin, Aspect}
-import kamon.trace.{Trace, TraceContext, ContextAware}
+import kamon.trace.{Trace, ContextAware}
 import spray.http.HttpRequest
 import akka.actor.ActorSystem
 import akka.event.Logging.Warning
diff --git a/kamon-spray/src/test/scala/kamon/ServerRequestTracingSpec.scala b/kamon-spray/src/test/scala/kamon/ServerRequestTracingSpec.scala
index d789042e..648c2f3d 100644
--- a/kamon-spray/src/test/scala/kamon/ServerRequestTracingSpec.scala
+++ b/kamon-spray/src/test/scala/kamon/ServerRequestTracingSpec.scala
@@ -33,7 +33,8 @@ class ServerRequestTracingSpec extends TestKit(ActorSystem("server-request-traci
       }
 
       within(5 seconds) {
-        val traceId = expectMsgPF() { case Start(id, _) => id}
+        val traceId = expectMsgPF() { case Start(id, _) => id }
+        println("Expecting for trace: " + traceId)
         expectMsgPF() { case Finish(traceId) => }
       }
     }
@@ -65,12 +66,13 @@ trait TestServer extends SimpleRoutingApp {
         path("ok") {
           complete("ok")
         } ~
-          path("clearcontext"){
-            complete {
-              Trace.clear
-              "ok"
-            }
+        path("clearcontext"){
+          complete {
+            println("The Context in the route is: " + Trace.context)
+            Trace.clear
+            "ok"
           }
+        }
       }
     ), timeout.duration).localAddress.getPort
 
-- 
cgit v1.2.3