From 539b54c3b43c68ad418ca77032f557a4da3e3a59 Mon Sep 17 00:00:00 2001
From: Ivan Topolnjak <ivantopo@gmail.com>
Date: Sun, 30 Aug 2015 13:36:27 +0200
Subject: wip: only the modules that actually require an actor system are
 getting one.

---
 .../play/instrumentation/RequestInstrumentation.scala    | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

(limited to 'kamon-play-2.3.x/src/main/scala/kamon/play/instrumentation/RequestInstrumentation.scala')

diff --git a/kamon-play-2.3.x/src/main/scala/kamon/play/instrumentation/RequestInstrumentation.scala b/kamon-play-2.3.x/src/main/scala/kamon/play/instrumentation/RequestInstrumentation.scala
index c8a808ec..01b37024 100644
--- a/kamon-play-2.3.x/src/main/scala/kamon/play/instrumentation/RequestInstrumentation.scala
+++ b/kamon-play-2.3.x/src/main/scala/kamon/play/instrumentation/RequestInstrumentation.scala
@@ -16,7 +16,7 @@
 package kamon.play.instrumentation
 
 import kamon.Kamon
-import kamon.play.Play
+import kamon.play.PlayExtension
 import kamon.trace._
 import kamon.util.SameThreadExecutionContext
 import org.aspectj.lang.ProceedingJoinPoint
@@ -34,10 +34,8 @@ class RequestInstrumentation {
   def beforeRouteRequest(requestHeader: RequestHeader): Unit = {
     import Kamon.tracer
 
-    val playExtension = Kamon(Play)
-
-    val token = if (playExtension.includeTraceToken) {
-      requestHeader.headers.get(playExtension.traceTokenHeaderName)
+    val token = if (PlayExtension.includeTraceToken) {
+      requestHeader.headers.get(PlayExtension.traceTokenHeaderName)
     } else None
 
     Tracer.setCurrentContext(tracer.newContext("UnnamedTrace", token))
@@ -47,21 +45,19 @@ class RequestInstrumentation {
   def aroundDoFilter(pjp: ProceedingJoinPoint, next: EssentialAction): Any = {
     val essentialAction = (requestHeader: RequestHeader) ⇒ {
 
-      val playExtension = Kamon(Play)
-
       def onResult(result: Result): Result = {
         Tracer.currentContext.collect { ctx ⇒
           ctx.finish()
 
           recordHttpServerMetrics(result.header, ctx.name)
 
-          if (playExtension.includeTraceToken) result.withHeaders(playExtension.traceTokenHeaderName -> ctx.token)
+          if (PlayExtension.includeTraceToken) result.withHeaders(PlayExtension.traceTokenHeaderName -> ctx.token)
           else result
 
         } getOrElse result
       }
       //override the current trace name
-      Tracer.currentContext.rename(playExtension.generateTraceName(requestHeader))
+      Tracer.currentContext.rename(PlayExtension.generateTraceName(requestHeader))
       // Invoke the action
       next(requestHeader).map(onResult)(SameThreadExecutionContext)
     }
@@ -76,5 +72,5 @@ class RequestInstrumentation {
   }
 
   def recordHttpServerMetrics(header: ResponseHeader, traceName: String): Unit =
-    Kamon(Play).httpServerMetrics.recordResponse(traceName, header.status.toString)
+    PlayExtension.httpServerMetrics.recordResponse(traceName, header.status.toString)
 }
-- 
cgit v1.2.3