diff options
author | Diego <diegolparra@gmail.com> | 2014-03-03 22:11:07 -0300 |
---|---|---|
committer | Diego <diegolparra@gmail.com> | 2014-03-03 22:11:07 -0300 |
commit | e2cc143f49398bbeafd9c796c5a0b4bf4a6d7958 (patch) | |
tree | 39e65ecf3d10b4771b9a1cd5acb9c0259c515b3b /kamon-play/src/test | |
parent | b3f7694cb8f1af4ef6747acd17dd0d6981df2030 (diff) | |
download | Kamon-e2cc143f49398bbeafd9c796c5a0b4bf4a6d7958.tar.gz Kamon-e2cc143f49398bbeafd9c796c5a0b4bf4a6d7958.tar.bz2 Kamon-e2cc143f49398bbeafd9c796c5a0b4bf4a6d7958.zip |
WIP:Play support and resolve #20
Diffstat (limited to 'kamon-play/src/test')
-rw-r--r-- | kamon-play/src/test/resources/conf/application.conf | 2 | ||||
-rw-r--r-- | kamon-play/src/test/scala/kamon/play/RequestInstrumentationSpec.scala | 53 |
2 files changed, 33 insertions, 22 deletions
diff --git a/kamon-play/src/test/resources/conf/application.conf b/kamon-play/src/test/resources/conf/application.conf index f2c654a8..b214edc0 100644 --- a/kamon-play/src/test/resources/conf/application.conf +++ b/kamon-play/src/test/resources/conf/application.conf @@ -1,7 +1,7 @@ kamon { play { include-trace-token-header = true - trace-token-header-name = "X-UOW" + trace-token-header-name = "X-Trace-Token" } } diff --git a/kamon-play/src/test/scala/kamon/play/RequestInstrumentationSpec.scala b/kamon-play/src/test/scala/kamon/play/RequestInstrumentationSpec.scala index 92b819da..5b75359f 100644 --- a/kamon-play/src/test/scala/kamon/play/RequestInstrumentationSpec.scala +++ b/kamon-play/src/test/scala/kamon/play/RequestInstrumentationSpec.scala @@ -26,6 +26,7 @@ import org.junit.runner.RunWith import org.specs2.runner.JUnitRunner import play.api.mvc.AsyncResult import play.api.test.FakeApplication +import kamon.play.action.TraceName @RunWith(classOf[JUnitRunner]) class RequestInstrumentationSpec extends PlaySpecification { @@ -59,36 +60,46 @@ class RequestInstrumentationSpec extends PlaySpecification { Action { Ok("default") } + case ("GET", "/async-renamed") ⇒ + TraceName("renamed-trace") { + Action.async { + Future { + Ok("Async.async") + } + } + } }) private val traceTokenValue = "kamon-trace-token-test" - private val traceTokenHeaderName = "X-UOW" + private val traceTokenHeaderName = "X-Trace-Token" private val expectedToken = Some(traceTokenValue) private val traceTokenHeader = (traceTokenHeaderName -> traceTokenValue) - "respond to the asyncResult action with X-Trace-Token" in new WithServer(appWithRoutes) { - val Some(result) = route(FakeRequest(GET, "/asyncResult").withHeaders(traceTokenHeader)) - header(traceTokenHeaderName, result) must equalTo(expectedToken) - } + "the request instrumentation" should { + "respond to the async action with X-Trace-Token" in new WithServer(appWithRoutes) { + val Some(result) = route(FakeRequest(GET, "/async").withHeaders(traceTokenHeader)) + header(traceTokenHeaderName, result) must equalTo(expectedToken) + } - "respond to the async action with X-Trace-Token" in new WithServer(appWithRoutes) { - val Some(result) = route(FakeRequest(GET, "/async").withHeaders(traceTokenHeader)) - header(traceTokenHeaderName, result) must equalTo(expectedToken) - } + "respond to the notFound action with X-Trace-Token" in new WithServer(appWithRoutes) { + val Some(result) = route(FakeRequest(GET, "/notFound").withHeaders(traceTokenHeader)) + header(traceTokenHeaderName, result) must equalTo(expectedToken) + } - "respond to the notFound action with X-Trace-Token" in new WithServer(appWithRoutes) { - val Some(result) = route(FakeRequest(GET, "/notFound").withHeaders(traceTokenHeader)) - header(traceTokenHeaderName, result) must equalTo(expectedToken) - } + "respond to the default action with X-Trace-Token" in new WithServer(appWithRoutes) { + val Some(result) = route(FakeRequest(GET, "/default").withHeaders(traceTokenHeader)) + header(traceTokenHeaderName, result) must equalTo(expectedToken) + } - "respond to the default action with X-Trace-Token" in new WithServer(appWithRoutes) { - val Some(result) = route(FakeRequest(GET, "/default").withHeaders(traceTokenHeader)) - header(traceTokenHeaderName, result) must equalTo(expectedToken) - } + "respond to the redirect action with X-Trace-Token" in new WithServer(appWithRoutes) { + val Some(result) = route(FakeRequest(GET, "/redirect").withHeaders(traceTokenHeader)) + header("Location", result) must equalTo(Some("/redirected")) + header(traceTokenHeaderName, result) must equalTo(expectedToken) + } - "respond to the redirect action with X-Trace-Token" in new WithServer(appWithRoutes) { - val Some(result) = route(FakeRequest(GET, "/redirect").withHeaders(traceTokenHeader)) - header("Location", result) must equalTo(Some("/redirected")) - header(traceTokenHeaderName, result) must equalTo(expectedToken) + "respond to the async action with X-Trace-Token and the renamed trace" in new WithServer(appWithRoutes) { + val Some(result) = route(FakeRequest(GET, "/async-renamed").withHeaders(traceTokenHeader)) + header(traceTokenHeaderName, result) must equalTo(expectedToken) + } } }
\ No newline at end of file |