From e2cc143f49398bbeafd9c796c5a0b4bf4a6d7958 Mon Sep 17 00:00:00 2001 From: Diego Date: Mon, 3 Mar 2014 22:11:07 -0300 Subject: WIP:Play support and resolve #20 --- .../kamon/play/action/KamonTraceActions.scala | 29 ++++++++++++ .../src/test/resources/conf/application.conf | 2 +- .../kamon/play/RequestInstrumentationSpec.scala | 53 +++++++++++++--------- 3 files changed, 62 insertions(+), 22 deletions(-) create mode 100644 kamon-play/src/main/scala/kamon/play/action/KamonTraceActions.scala (limited to 'kamon-play/src') diff --git a/kamon-play/src/main/scala/kamon/play/action/KamonTraceActions.scala b/kamon-play/src/main/scala/kamon/play/action/KamonTraceActions.scala new file mode 100644 index 00000000..0e777fd5 --- /dev/null +++ b/kamon-play/src/main/scala/kamon/play/action/KamonTraceActions.scala @@ -0,0 +1,29 @@ +/* =================================================== + * Copyright © 2013-2014 the kamon project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ========================================================== */ + +package kamon.play.action + +import kamon.trace.TraceRecorder +import play.api.mvc._ +import scala.concurrent.Future + +case class TraceName[A](name: String)(action: Action[A]) extends Action[A] { + def apply(request: Request[A]): Future[SimpleResult] = { + TraceRecorder.rename(name) + action(request) + } + lazy val parser = action.parser +} 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 -- cgit v1.2.3