= play: fix ClassCastException in tests

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)
         }
       }
     }