From c2d108ca26faecc5be77fd05c69d4eac7982fa3e Mon Sep 17 00:00:00 2001
From: Diego <diegolparra@gmail.com>
Date: Tue, 2 Dec 2014 00:58:30 -0300
Subject: + core, play: introduce kamon-dispatcher

---
 kamon-play/src/main/scala/kamon/play/Play.scala                       | 2 +-
 .../scala/kamon/play/instrumentation/RequestInstrumentation.scala     | 2 +-
 .../src/main/scala/kamon/play/instrumentation/WSInstrumentation.scala | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'kamon-play/src/main/scala/kamon')

diff --git a/kamon-play/src/main/scala/kamon/play/Play.scala b/kamon-play/src/main/scala/kamon/play/Play.scala
index 9b69f9a3..6c6cbf4c 100644
--- a/kamon-play/src/main/scala/kamon/play/Play.scala
+++ b/kamon-play/src/main/scala/kamon/play/Play.scala
@@ -55,6 +55,6 @@ trait PlayNameGenerator {
 }
 
 class DefaultPlayNameGenerator extends PlayNameGenerator {
-  def generateTraceName(requestHeader: RequestHeader): String = requestHeader.method + ": " + requestHeader.uri
+  def generateTraceName(requestHeader: RequestHeader): String = s"${requestHeader.method}: ${requestHeader.uri}"
   def generateHttpClientSegmentName(request: WSRequest): String = request.url
 }
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 1ce41a75..1bafa8ff 100644
--- a/kamon-play/src/main/scala/kamon/play/instrumentation/RequestInstrumentation.scala
+++ b/kamon-play/src/main/scala/kamon/play/instrumentation/RequestInstrumentation.scala
@@ -55,7 +55,7 @@ class RequestInstrumentation {
   @Around("call(* play.api.GlobalSettings.doFilter(*)) && args(next)")
   def aroundDoFilter(pjp: ProceedingJoinPoint, next: EssentialAction): Any = {
     val essentialAction = (requestHeader: RequestHeader) ⇒ {
-      // TODO: Move to a Kamon-specific dispatcher.
+
       val executor = Kamon(Play)(Akka.system()).defaultDispatcher
 
       def onResult(result: Result): Result = {
diff --git a/kamon-play/src/main/scala/kamon/play/instrumentation/WSInstrumentation.scala b/kamon-play/src/main/scala/kamon/play/instrumentation/WSInstrumentation.scala
index f16c76c8..fca13c4c 100644
--- a/kamon-play/src/main/scala/kamon/play/instrumentation/WSInstrumentation.scala
+++ b/kamon-play/src/main/scala/kamon/play/instrumentation/WSInstrumentation.scala
@@ -18,7 +18,7 @@ package kamon.play.instrumentation
 
 import kamon.Kamon
 import kamon.play.Play
-import kamon.trace.{ SegmentCategory, SegmentMetricIdentity, TraceRecorder }
+import kamon.trace.{ SegmentCategory, TraceRecorder }
 import org.aspectj.lang.ProceedingJoinPoint
 import org.aspectj.lang.annotation.{ Around, Aspect, Pointcut }
 import play.api.libs.ws.{ WSRequest, WSResponse }
@@ -42,6 +42,6 @@ class WSInstrumentation {
 
       response.map(result ⇒ segment.finish())(executor)
       response
-    } getOrElse (pjp.proceed())
+    } getOrElse pjp.proceed()
   }
 }
\ No newline at end of file
-- 
cgit v1.2.3