aboutsummaryrefslogtreecommitdiff
path: root/kamon-spray/src/test/scala/kamon
diff options
context:
space:
mode:
authorIvan Topolnjak <ivantopo@gmail.com>2013-11-25 02:09:43 -0300
committerIvan Topolnjak <ivantopo@gmail.com>2013-11-25 02:09:43 -0300
commit1e7a60be32b42df1669933ca40bb8d47740fe90d (patch)
treedc689d59755621921d7bbe03fc63189b30a75fd5 /kamon-spray/src/test/scala/kamon
parent3daf857ad6236e6b3671dd272f0eaa5e90ed5aa9 (diff)
downloadKamon-1e7a60be32b42df1669933ca40bb8d47740fe90d.tar.gz
Kamon-1e7a60be32b42df1669933ca40bb8d47740fe90d.tar.bz2
Kamon-1e7a60be32b42df1669933ca40bb8d47740fe90d.zip
fix conflict between futures and spray server instrumentation
Diffstat (limited to 'kamon-spray/src/test/scala/kamon')
-rw-r--r--kamon-spray/src/test/scala/kamon/ServerRequestTracingSpec.scala14
1 files changed, 8 insertions, 6 deletions
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