aboutsummaryrefslogtreecommitdiff
path: root/kamon-play/src/test/scala
diff options
context:
space:
mode:
Diffstat (limited to 'kamon-play/src/test/scala')
-rw-r--r--kamon-play/src/test/scala/kamon/play/RequestInstrumentationSpec.scala14
-rw-r--r--kamon-play/src/test/scala/kamon/play/WSInstrumentationSpec.scala1
2 files changed, 1 insertions, 14 deletions
diff --git a/kamon-play/src/test/scala/kamon/play/RequestInstrumentationSpec.scala b/kamon-play/src/test/scala/kamon/play/RequestInstrumentationSpec.scala
index 0c4ac57b..b14fe996 100644
--- a/kamon-play/src/test/scala/kamon/play/RequestInstrumentationSpec.scala
+++ b/kamon-play/src/test/scala/kamon/play/RequestInstrumentationSpec.scala
@@ -24,7 +24,6 @@ import scala.concurrent.ExecutionContext.Implicits.global
import scala.concurrent.Future
import org.junit.runner.RunWith
import org.specs2.runner.JUnitRunner
-import play.api.mvc.AsyncResult
import play.api.test.FakeApplication
import kamon.play.action.TraceName
@@ -34,14 +33,6 @@ class RequestInstrumentationSpec extends PlaySpecification {
System.setProperty("config.file", "./kamon-play/src/test/resources/conf/application.conf")
val appWithRoutes = FakeApplication(withRoutes = {
- case ("GET", "/asyncResult") ⇒
- Action {
- AsyncResult {
- scala.concurrent.Future {
- Ok("AsyncResult")
- }
- }
- }
case ("GET", "/async") ⇒
Action.async {
Future {
@@ -76,11 +67,6 @@ class RequestInstrumentationSpec extends PlaySpecification {
private val traceTokenHeader = traceTokenHeaderName -> traceTokenValue
"the Request instrumentation" should {
- "respond to the asyncResult action with X-Trace-Token" in new WithServer(appWithRoutes) {
- val Some(result) = route(FakeRequest(GET, "/asyncResult").withHeaders(traceTokenHeader))
- header(traceTokenHeaderName, result) must equalTo(expectedToken)
- }
-
"respond to the Async Action with X-Trace-Token" in new WithServer(appWithRoutes) {
val Some(result) = route(FakeRequest(GET, "/async").withHeaders(traceTokenHeader))
header(traceTokenHeaderName, result) must equalTo(expectedToken)
diff --git a/kamon-play/src/test/scala/kamon/play/WSInstrumentationSpec.scala b/kamon-play/src/test/scala/kamon/play/WSInstrumentationSpec.scala
index b321d123..ee51d07d 100644
--- a/kamon-play/src/test/scala/kamon/play/WSInstrumentationSpec.scala
+++ b/kamon-play/src/test/scala/kamon/play/WSInstrumentationSpec.scala
@@ -25,6 +25,7 @@ import org.junit.runner.RunWith
import org.specs2.runner.JUnitRunner
import play.api.test.FakeApplication
import play.api.libs.ws.WS
+import play.api.Play.current
import scala.util._
import scala.concurrent.Await
import scala.concurrent.duration._