From 6fa94ed9ac32ef275a89688a22d0ba33366f0342 Mon Sep 17 00:00:00 2001 From: Brian Devins-Suresh Date: Fri, 20 Mar 2020 15:14:34 -0400 Subject: [PATCH] Update to new module name --- dd-java-agent/instrumentation/play-2.3/play-2.3.gradle | 2 +- .../src/test/groovy/client/PlayWSClientTest.groovy | 7 +------ .../play-2.3/src/test/groovy/server/PlayServerTest.groovy | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/dd-java-agent/instrumentation/play-2.3/play-2.3.gradle b/dd-java-agent/instrumentation/play-2.3/play-2.3.gradle index 1e5c01151b..fc88656192 100644 --- a/dd-java-agent/instrumentation/play-2.3/play-2.3.gradle +++ b/dd-java-agent/instrumentation/play-2.3/play-2.3.gradle @@ -37,7 +37,7 @@ testSets { dependencies { main_java8Compile group: 'com.typesafe.play', name: 'play_2.11', version: '2.3.0' - testCompile project(':dd-java-agent:instrumentation:netty-3.9') + testCompile project(':dd-java-agent:instrumentation:netty-3.8') testCompile group: 'com.typesafe.play', name: 'play-java_2.11', version: '2.3.0' testCompile group: 'com.typesafe.play', name: 'play-java-ws_2.11', version: '2.3.0' diff --git a/dd-java-agent/instrumentation/play-2.3/src/test/groovy/client/PlayWSClientTest.groovy b/dd-java-agent/instrumentation/play-2.3/src/test/groovy/client/PlayWSClientTest.groovy index e9165f086b..e254806bb4 100644 --- a/dd-java-agent/instrumentation/play-2.3/src/test/groovy/client/PlayWSClientTest.groovy +++ b/dd-java-agent/instrumentation/play-2.3/src/test/groovy/client/PlayWSClientTest.groovy @@ -1,7 +1,7 @@ package client import datadog.trace.agent.test.base.HttpClientTest -import datadog.trace.instrumentation.netty39.client.NettyHttpClientDecorator +import datadog.trace.instrumentation.netty38.client.NettyHttpClientDecorator import play.GlobalSettings import play.libs.ws.WS import play.test.FakeApplication @@ -14,11 +14,6 @@ class PlayWSClientTest extends HttpClientTest { @Shared def application = new FakeApplication(new File("."), FakeApplication.class.getClassLoader(), Collections.emptyMap(), Collections.emptyList(), new GlobalSettings()) -// @Subject -// @Shared -// @AutoCleanup -// def client = WS.client() - def setup() { Helpers.start(application) } diff --git a/dd-java-agent/instrumentation/play-2.3/src/test/groovy/server/PlayServerTest.groovy b/dd-java-agent/instrumentation/play-2.3/src/test/groovy/server/PlayServerTest.groovy index 9267d0b9c7..c8ce2c32c5 100644 --- a/dd-java-agent/instrumentation/play-2.3/src/test/groovy/server/PlayServerTest.groovy +++ b/dd-java-agent/instrumentation/play-2.3/src/test/groovy/server/PlayServerTest.groovy @@ -6,7 +6,7 @@ import datadog.trace.agent.test.base.HttpServerTest import datadog.trace.api.DDSpanTypes import datadog.trace.api.DDTags import datadog.trace.bootstrap.instrumentation.api.Tags -import datadog.trace.instrumentation.netty39.server.NettyHttpServerDecorator +import datadog.trace.instrumentation.netty38.server.NettyHttpServerDecorator import datadog.trace.instrumentation.play23.PlayHttpServerDecorator import play.api.test.TestServer