aboutsummaryrefslogtreecommitdiff
path: root/kamon-play/src/main
diff options
context:
space:
mode:
authorDiego <diegolparra@gmail.com>2014-04-23 13:38:11 -0300
committerDiego <diegolparra@gmail.com>2014-04-23 13:38:11 -0300
commit620ab1bab83254d0f49bd7c097dc2d0aa01d70da (patch)
treec8bae900e8070a3d0b8e0a546238faeb91b02695 /kamon-play/src/main
parentced494db410a39a96e92d3dd376f8e9be4d309d6 (diff)
downloadKamon-620ab1bab83254d0f49bd7c097dc2d0aa01d70da.tar.gz
Kamon-620ab1bab83254d0f49bd7c097dc2d0aa01d70da.tar.bz2
Kamon-620ab1bab83254d0f49bd7c097dc2d0aa01d70da.zip
+ all: fix compilation issues
Diffstat (limited to 'kamon-play/src/main')
-rw-r--r--kamon-play/src/main/scala/kamon/play/action/KamonTraceActions.scala2
-rw-r--r--kamon-play/src/main/scala/kamon/play/instrumentation/WSInstrumentation.scala6
2 files changed, 4 insertions, 4 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 0e777fd5..36eabf8e 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[SimpleResult] = {
+ def apply(request: Request[A]): Future[Result] = {
TraceRecorder.rename(name)
action(request)
}
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 fce5ca13..8595c348 100644
--- a/kamon-play/src/main/scala/kamon/play/instrumentation/WSInstrumentation.scala
+++ b/kamon-play/src/main/scala/kamon/play/instrumentation/WSInstrumentation.scala
@@ -20,9 +20,9 @@ import org.aspectj.lang.annotation.{ Around, Pointcut, Aspect }
import org.aspectj.lang.ProceedingJoinPoint
import kamon.trace.TraceRecorder
import kamon.metrics.TraceMetrics.HttpClientRequest
-import play.api.libs.ws.WS.WSRequest
+import play.api.libs.ws.WSRequest
import scala.concurrent.Future
-import play.api.libs.ws.Response
+import play.api.libs.ws.WSResponse
import scala.util.{ Failure, Success }
import scala.concurrent.ExecutionContext.Implicits.global
@@ -38,7 +38,7 @@ class WSInstrumentation {
val completionHandle = TraceRecorder.startSegment(HttpClientRequest(request.url, UserTime), basicRequestAttributes(request))
- val response = pjp.proceed().asInstanceOf[Future[Response]]
+ val response = pjp.proceed().asInstanceOf[Future[WSResponse]]
response.onComplete {
case Failure(t) ⇒ completionHandle.map(_.finish(Map("completed-with-error" -> t.getMessage)))