aboutsummaryrefslogtreecommitdiff
path: root/kamon-play/src/main/scala/kamon/play/instrumentation/WSInstrumentation.scala
diff options
context:
space:
mode:
Diffstat (limited to 'kamon-play/src/main/scala/kamon/play/instrumentation/WSInstrumentation.scala')
-rw-r--r--kamon-play/src/main/scala/kamon/play/instrumentation/WSInstrumentation.scala11
1 files changed, 6 insertions, 5 deletions
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 125db85e..c58e9f0c 100644
--- a/kamon-play/src/main/scala/kamon/play/instrumentation/WSInstrumentation.scala
+++ b/kamon-play/src/main/scala/kamon/play/instrumentation/WSInstrumentation.scala
@@ -18,17 +18,18 @@ package kamon.play.instrumentation
import kamon.Kamon
import kamon.play.Play
-import kamon.trace.{ SegmentMetricIdentityLabel, SegmentMetricIdentity, TraceRecorder }
+import kamon.trace.SegmentMetricIdentityLabel
import org.aspectj.lang.ProceedingJoinPoint
import org.aspectj.lang.annotation.{ Around, Aspect, Pointcut }
-import play.api.libs.ws.{ WSRequest, WSResponse }
-
+import kamon.trace.TraceRecorder
+import play.api.libs.ws.WS.WSRequest
import scala.concurrent.Future
+import play.api.libs.ws.Response
@Aspect
class WSInstrumentation {
- @Pointcut("execution(* play.api.libs.ws.ning.NingWSRequest.execute()) && this(request)")
+ @Pointcut("execution(* play.api.libs.ws.WS$WSRequest.execute()) && this(request)")
def onExecuteRequest(request: WSRequest): Unit = {}
@Around("onExecuteRequest(request)")
@@ -38,7 +39,7 @@ class WSInstrumentation {
val executor = playExtension.defaultDispatcher
val segmentName = playExtension.generateHttpClientSegmentName(request)
val segment = ctx.startSegment(segmentName, SegmentMetricIdentityLabel.HttpClient)
- val response = pjp.proceed().asInstanceOf[Future[WSResponse]]
+ val response = pjp.proceed().asInstanceOf[Future[Response]]
response.map(result ⇒ segment.finish())(executor)
response