diff options
author | Diego <diegolparra@gmail.com> | 2014-11-09 20:05:57 -0300 |
---|---|---|
committer | Diego <diegolparra@gmail.com> | 2014-11-09 20:05:57 -0300 |
commit | 63b31056da21238188931552102f963982c96543 (patch) | |
tree | b7ba566764922592481f0f886e2fa78f539e092e | |
parent | cf07e7eada60d7a0d34b68b45b4b02c9c57f62ef (diff) | |
download | Kamon-63b31056da21238188931552102f963982c96543.tar.gz Kamon-63b31056da21238188931552102f963982c96543.tar.bz2 Kamon-63b31056da21238188931552102f963982c96543.zip |
= play: fix ClassCastException in tests
-rw-r--r-- | kamon-play/src/main/scala/kamon/play/instrumentation/RequestInstrumentation.scala | 20 | ||||
-rw-r--r-- | kamon-play/src/test/scala/kamon/play/RequestInstrumentationSpec.scala | 2 |
2 files changed, 8 insertions, 14 deletions
diff --git a/kamon-play/src/main/scala/kamon/play/instrumentation/RequestInstrumentation.scala b/kamon-play/src/main/scala/kamon/play/instrumentation/RequestInstrumentation.scala index ea188dbf..897acce6 100644 --- a/kamon-play/src/main/scala/kamon/play/instrumentation/RequestInstrumentation.scala +++ b/kamon-play/src/main/scala/kamon/play/instrumentation/RequestInstrumentation.scala @@ -55,36 +55,30 @@ class RequestInstrumentation { // TODO: Move to a Kamon-specific dispatcher. val executor = Kamon(Play)(Akka.system()).defaultDispatcher - def onResult(result: SimpleResult): Result = { - + def onResult(result: SimpleResult): SimpleResult = { TraceRecorder.withTraceContextAndSystem { (ctx, system) ⇒ ctx.finish() val playExtension = Kamon(Play)(system) recordHttpServerMetrics(result.header, ctx.name, playExtension) - if (playExtension.includeTraceToken) - result.withHeaders(playExtension.traceTokenHeaderName -> ctx.token) - else - result - - } getOrElse (result) + if (playExtension.includeTraceToken) result.withHeaders(playExtension.traceTokenHeaderName -> ctx.token) + else result + } getOrElse result } - //override the current trace name - normaliseTraceName(requestHeader).map(TraceRecorder.rename(_)) + normaliseTraceName(requestHeader).map(TraceRecorder.rename) // Invoke the action next(requestHeader).map(onResult)(executor) } - - pjp.proceed(Array(essentialAction)) + pjp.proceed(Array(EssentialAction(essentialAction))) } @Before("execution(* play.api.GlobalSettings+.onError(..)) && args(request, ex)") def beforeOnError(request: TraceContextAware, ex: Throwable): Unit = TraceRecorder.withTraceContextAndSystem { (ctx, system) ⇒ val playExtension = Kamon(Play)(system) - playExtension.httpServerMetrics.recordResponse(ctx.name, "505") + playExtension.httpServerMetrics.recordResponse(ctx.name, "500") } private def recordHttpServerMetrics(header: ResponseHeader, traceName: String, playExtension: PlayExtension): Unit = diff --git a/kamon-play/src/test/scala/kamon/play/RequestInstrumentationSpec.scala b/kamon-play/src/test/scala/kamon/play/RequestInstrumentationSpec.scala index 976e7bc0..aec319d5 100644 --- a/kamon-play/src/test/scala/kamon/play/RequestInstrumentationSpec.scala +++ b/kamon-play/src/test/scala/kamon/play/RequestInstrumentationSpec.scala @@ -180,7 +180,7 @@ class RequestInstrumentationSpec extends PlaySpec with OneServerPerSuite { TraceLocal.store(TraceLocalKey)(header.headers.get(traceLocalStorageKey).getOrElse("unknown")) next(header).map { - result ⇒ result.withHeaders((traceLocalStorageKey -> TraceLocal.retrieve(TraceLocalKey).get)) + result ⇒ result.withHeaders(traceLocalStorageKey -> TraceLocal.retrieve(TraceLocalKey).get) } } } |