diff options
Diffstat (limited to 'kamon-play')
5 files changed, 7 insertions, 8 deletions
diff --git a/kamon-play/src/main/scala/kamon/play/action/KamonTraceActions.scala b/kamon-play/src/main/scala/kamon/play/action/KamonTraceActions.scala index 36eabf8e..0e777fd5 100644 --- a/kamon-play/src/main/scala/kamon/play/action/KamonTraceActions.scala +++ b/kamon-play/src/main/scala/kamon/play/action/KamonTraceActions.scala @@ -21,7 +21,7 @@ import play.api.mvc._ import scala.concurrent.Future case class TraceName[A](name: String)(action: Action[A]) extends Action[A] { - def apply(request: Request[A]): Future[Result] = { + def apply(request: Request[A]): Future[SimpleResult] = { TraceRecorder.rename(name) action(request) } 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 975510e9..3247fcc9 100644 --- a/kamon-play/src/main/scala/kamon/play/instrumentation/RequestInstrumentation.scala +++ b/kamon-play/src/main/scala/kamon/play/instrumentation/RequestInstrumentation.scala @@ -76,7 +76,7 @@ class RequestInstrumentation { pjp.proceed(Array(EssentialAction(essentialAction))) } - def recordHttpServerMetrics(result: Result, traceName: String, playExtension: PlayExtension): Unit = + def recordHttpServerMetrics(result: SimpleResult, traceName: String, playExtension: PlayExtension): Unit = playExtension.httpServerMetrics.recordResponse(traceName, result.header.status.toString, 1L) @Around("execution(* play.api.GlobalSettings+.onError(..)) && args(request, ex)") 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 2862ba19..b9f09111 100644 --- a/kamon-play/src/main/scala/kamon/play/instrumentation/WSInstrumentation.scala +++ b/kamon-play/src/main/scala/kamon/play/instrumentation/WSInstrumentation.scala @@ -20,16 +20,16 @@ import org.aspectj.lang.annotation.{ Around, Pointcut, Aspect } import org.aspectj.lang.ProceedingJoinPoint import kamon.trace.TraceRecorder import kamon.metric.TraceMetrics.HttpClientRequest -import play.api.libs.ws.WSRequest +import play.api.libs.ws.WS.WSRequest import scala.concurrent.Future -import play.api.libs.ws.WSResponse +import play.api.libs.ws.Response import scala.util.{ Failure, Success } import scala.concurrent.ExecutionContext.Implicits.global @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 +38,7 @@ class WSInstrumentation { val completionHandle = TraceRecorder.startSegment(HttpClientRequest(request.url), basicRequestAttributes(request)) - val response = pjp.proceed().asInstanceOf[Future[WSResponse]] + val response = pjp.proceed().asInstanceOf[Future[Response]] response.onComplete { case Failure(t) ⇒ completionHandle.map(_.finish(Map("completed-with-error" -> t.getMessage))) diff --git a/kamon-play/src/test/scala/kamon/play/RequestInstrumentationSpec.scala b/kamon-play/src/test/scala/kamon/play/RequestInstrumentationSpec.scala index fc195580..eff6f280 100644 --- a/kamon-play/src/test/scala/kamon/play/RequestInstrumentationSpec.scala +++ b/kamon-play/src/test/scala/kamon/play/RequestInstrumentationSpec.scala @@ -140,7 +140,7 @@ class RequestInstrumentationSpec extends PlaySpec with OneServerPerSuite { } object TraceLocalFilter extends Filter { - override def apply(next: (RequestHeader) ⇒ Future[Result])(header: RequestHeader): Future[Result] = { + override def apply(next: (RequestHeader) ⇒ Future[SimpleResult])(header: RequestHeader): Future[SimpleResult] = { TraceRecorder.withTraceContext(TraceRecorder.currentContext) { TraceLocal.store(TraceLocalKey)(header.headers.get(traceLocalStorageKey).getOrElse("unknown")) diff --git a/kamon-play/src/test/scala/kamon/play/WSInstrumentationSpec.scala b/kamon-play/src/test/scala/kamon/play/WSInstrumentationSpec.scala index 775d3e26..a9a2d5fa 100644 --- a/kamon-play/src/test/scala/kamon/play/WSInstrumentationSpec.scala +++ b/kamon-play/src/test/scala/kamon/play/WSInstrumentationSpec.scala @@ -36,7 +36,6 @@ class WSInstrumentationSpec extends TestKitBase with WordSpecLike with Matchers System.setProperty("config.file", "./kamon-play/src/test/resources/conf/application.conf") - import scala.collection.immutable.StringLike._ implicit lazy val system: ActorSystem = ActorSystem("play-ws-instrumentation-spec", ConfigFactory.parseString( """ |akka { |