aboutsummaryrefslogtreecommitdiff
path: root/kamon-play/src/main/scala/kamon/play/instrumentation
diff options
context:
space:
mode:
authorDiego <diegolparra@gmail.com>2014-12-02 00:58:30 -0300
committerDiego <diegolparra@gmail.com>2014-12-02 00:58:30 -0300
commitc2d108ca26faecc5be77fd05c69d4eac7982fa3e (patch)
tree51d239aea06ac10077b5fc3104470062435931f7 /kamon-play/src/main/scala/kamon/play/instrumentation
parentbedda495bbfe3696609294408c4bc50cefbcdd8f (diff)
downloadKamon-c2d108ca26faecc5be77fd05c69d4eac7982fa3e.tar.gz
Kamon-c2d108ca26faecc5be77fd05c69d4eac7982fa3e.tar.bz2
Kamon-c2d108ca26faecc5be77fd05c69d4eac7982fa3e.zip
+ core, play: introduce kamon-dispatcher
Diffstat (limited to 'kamon-play/src/main/scala/kamon/play/instrumentation')
-rw-r--r--kamon-play/src/main/scala/kamon/play/instrumentation/RequestInstrumentation.scala2
-rw-r--r--kamon-play/src/main/scala/kamon/play/instrumentation/WSInstrumentation.scala4
2 files changed, 3 insertions, 3 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 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