aboutsummaryrefslogtreecommitdiff
path: root/kamon-play/src/test
diff options
context:
space:
mode:
authorDiego <diegolparra@gmail.com>2014-12-02 00:58:30 -0300
committerDiego <diegolparra@gmail.com>2014-12-02 00:58:30 -0300
commitc2d108ca26faecc5be77fd05c69d4eac7982fa3e (patch)
tree51d239aea06ac10077b5fc3104470062435931f7 /kamon-play/src/test
parentbedda495bbfe3696609294408c4bc50cefbcdd8f (diff)
downloadKamon-c2d108ca26faecc5be77fd05c69d4eac7982fa3e.tar.gz
Kamon-c2d108ca26faecc5be77fd05c69d4eac7982fa3e.tar.bz2
Kamon-c2d108ca26faecc5be77fd05c69d4eac7982fa3e.zip
+ core, play: introduce kamon-dispatcher
Diffstat (limited to 'kamon-play/src/test')
-rw-r--r--kamon-play/src/test/scala/kamon/play/RequestInstrumentationSpec.scala11
1 files changed, 5 insertions, 6 deletions
diff --git a/kamon-play/src/test/scala/kamon/play/RequestInstrumentationSpec.scala b/kamon-play/src/test/scala/kamon/play/RequestInstrumentationSpec.scala
index 3c3ce9f2..564d5abe 100644
--- a/kamon-play/src/test/scala/kamon/play/RequestInstrumentationSpec.scala
+++ b/kamon-play/src/test/scala/kamon/play/RequestInstrumentationSpec.scala
@@ -21,7 +21,6 @@ import kamon.metric.{ CollectionContext, Metrics, TraceMetrics }
import kamon.play.action.TraceName
import kamon.trace.TraceLocal.HttpContextKey
import kamon.trace.{ TraceLocal, TraceRecorder }
-import org.scalatest.Matchers
import org.scalatestplus.play._
import play.api.DefaultGlobal
import play.api.http.Writeable
@@ -124,23 +123,23 @@ class RequestInstrumentationSpec extends PlaySpec with OneServerPerSuite {
}
"propagate the TraceContext and LocalStorage through of filters in the current request" in {
- val Some(result) = route(FakeRequest(GET, "/retrieve").withHeaders(traceTokenHeader, traceLocalStorageHeader))
+ route(FakeRequest(GET, "/retrieve").withHeaders(traceTokenHeader, traceLocalStorageHeader))
TraceLocal.retrieve(TraceLocalKey).get must be(traceLocalStorageValue)
}
"response to the getRouted Action and normalise the current TraceContext name" in {
Await.result(WS.url("http://localhost:19001/getRouted").get(), 10 seconds)
- Kamon(Metrics)(Akka.system()).storage.get(TraceMetrics("getRouted.get")) must not be (empty)
+ Kamon(Metrics)(Akka.system()).storage.get(TraceMetrics("getRouted.get")) must not be empty
}
"response to the postRouted Action and normalise the current TraceContext name" in {
Await.result(WS.url("http://localhost:19001/postRouted").post("content"), 10 seconds)
- Kamon(Metrics)(Akka.system()).storage.get(TraceMetrics("postRouted.post")) must not be (empty)
+ Kamon(Metrics)(Akka.system()).storage.get(TraceMetrics("postRouted.post")) must not be empty
}
"response to the showRouted Action and normalise the current TraceContext name" in {
Await.result(WS.url("http://localhost:19001/showRouted/2").get(), 10 seconds)
- Kamon(Metrics)(Akka.system()).storage.get(TraceMetrics("show.some.id.get")) must not be (empty)
+ Kamon(Metrics)(Akka.system()).storage.get(TraceMetrics("show.some.id.get")) must not be empty
}
"include HttpContext information for help to diagnose possible errors" in {
@@ -230,7 +229,7 @@ object Routes extends Router.Routes {
Route("GET", PathPattern(List(StaticPart(Routes.prefix), StaticPart(Routes.defaultPrefix), StaticPart("getRouted"))))
private[this] lazy val Application_show =
- Route("GET", PathPattern(List(StaticPart(Routes.prefix), StaticPart(Routes.defaultPrefix), StaticPart("showRouted/"), DynamicPart("id", """[^/]+""", true))))
+ Route("GET", PathPattern(List(StaticPart(Routes.prefix), StaticPart(Routes.defaultPrefix), StaticPart("showRouted/"), DynamicPart("id", """[^/]+""", encodeable = true))))
//Posts
private[this] lazy val Application_postRouted =