Move play-ws-1 and play-ws-2 into separate packages
RENAME
dd-java-agent/instrumentation/play-ws-1/src/main/java/datadog/trace/instrumentation/playws/AsyncHandlerWrapper.java
dd-java-agent/instrumentation/play-ws-1/src/main/java/datadog/trace/instrumentation/playws1/AsyncHandlerWrapper.java
-package datadog.trace.instrumentation.playws;
+package datadog.trace.instrumentation.playws1;
import static datadog.trace.instrumentation.api.AgentTracer.propagate;
-import static datadog.trace.instrumentation.playws.PlayWSClientDecorator.DECORATE;
+import static datadog.trace.instrumentation.playws1.PlayWSClientDecorator.DECORATE;
import datadog.trace.context.TraceScope;
import datadog.trace.instrumentation.api.AgentSpan;

RENAME
dd-java-agent/instrumentation/play-ws-2/src/main/java/datadog/trace/instrumentation/playws/HeadersInjectAdapter.java
dd-java-agent/instrumentation/play-ws-1/src/main/java/datadog/trace/instrumentation/playws1/HeadersInjectAdapter.java
-package datadog.trace.instrumentation.playws;
+package datadog.trace.instrumentation.playws1;
import datadog.trace.instrumentation.api.AgentPropagation;
import play.shaded.ahc.org.asynchttpclient.Request;

RENAME
dd-java-agent/instrumentation/play-ws-2/src/main/java/datadog/trace/instrumentation/playws/PlayWSClientDecorator.java
dd-java-agent/instrumentation/play-ws-1/src/main/java/datadog/trace/instrumentation/playws1/PlayWSClientDecorator.java
-package datadog.trace.instrumentation.playws;
+package datadog.trace.instrumentation.playws1;
import datadog.trace.agent.decorator.HttpClientDecorator;
import java.net.URI;

RENAME
dd-java-agent/instrumentation/play-ws-2/src/main/java/datadog/trace/instrumentation/playws/PlayWSClientInstrumentation.java
dd-java-agent/instrumentation/play-ws-1/src/main/java/datadog/trace/instrumentation/playws1/PlayWSClientInstrumentation.java
-package datadog.trace.instrumentation.playws;
+package datadog.trace.instrumentation.playws1;
import static datadog.trace.agent.tooling.ByteBuddyElementMatchers.safeHasSuperType;
import static datadog.trace.instrumentation.api.AgentTracer.propagate;
import static datadog.trace.instrumentation.api.AgentTracer.startSpan;
-import static datadog.trace.instrumentation.playws.HeadersInjectAdapter.SETTER;
-import static datadog.trace.instrumentation.playws.PlayWSClientDecorator.DECORATE;
+import static datadog.trace.instrumentation.playws1.HeadersInjectAdapter.SETTER;
+import static datadog.trace.instrumentation.playws1.PlayWSClientDecorator.DECORATE;
import static java.util.Collections.singletonMap;
import static net.bytebuddy.matcher.ElementMatchers.isMethod;
import static net.bytebuddy.matcher.ElementMatchers.named;

MODIFY
dd-java-agent/instrumentation/play-ws-1/src/test/groovy/PlayWSClientTest.groovy
dd-java-agent/instrumentation/play-ws-1/src/test/groovy/PlayWSClientTest.groovy
@@ -2,7 +2,7 @@ import akka.actor.ActorSystem
import akka.stream.ActorMaterializer
import akka.stream.ActorMaterializerSettings
import datadog.trace.agent.test.base.HttpClientTest
-import datadog.trace.instrumentation.playws.PlayWSClientDecorator
+import datadog.trace.instrumentation.playws1.PlayWSClientDecorator
import play.libs.ws.StandaloneWSClient
import play.libs.ws.StandaloneWSRequest
import play.libs.ws.StandaloneWSResponse

RENAME
dd-java-agent/instrumentation/play-ws-2/src/main/java/datadog/trace/instrumentation/playws/AsyncHandlerWrapper.java
dd-java-agent/instrumentation/play-ws-2/src/main/java/datadog/trace/instrumentation/playws2/AsyncHandlerWrapper.java
-package datadog.trace.instrumentation.playws;
+package datadog.trace.instrumentation.playws2;
import static datadog.trace.instrumentation.api.AgentTracer.propagate;
-import static datadog.trace.instrumentation.playws.PlayWSClientDecorator.DECORATE;
+import static datadog.trace.instrumentation.playws2.PlayWSClientDecorator.DECORATE;
import datadog.trace.context.TraceScope;
import datadog.trace.instrumentation.api.AgentSpan;

RENAME
dd-java-agent/instrumentation/play-ws-1/src/main/java/datadog/trace/instrumentation/playws/HeadersInjectAdapter.java
dd-java-agent/instrumentation/play-ws-2/src/main/java/datadog/trace/instrumentation/playws2/HeadersInjectAdapter.java
-package datadog.trace.instrumentation.playws;
+package datadog.trace.instrumentation.playws2;
import datadog.trace.instrumentation.api.AgentPropagation;
import play.shaded.ahc.org.asynchttpclient.Request;

RENAME
dd-java-agent/instrumentation/play-ws-1/src/main/java/datadog/trace/instrumentation/playws/PlayWSClientDecorator.java
dd-java-agent/instrumentation/play-ws-2/src/main/java/datadog/trace/instrumentation/playws2/PlayWSClientDecorator.java
-package datadog.trace.instrumentation.playws;
+package datadog.trace.instrumentation.playws2;
import datadog.trace.agent.decorator.HttpClientDecorator;
import java.net.URI;

RENAME
dd-java-agent/instrumentation/play-ws-1/src/main/java/datadog/trace/instrumentation/playws/PlayWSClientInstrumentation.java
dd-java-agent/instrumentation/play-ws-2/src/main/java/datadog/trace/instrumentation/playws2/PlayWSClientInstrumentation.java
-package datadog.trace.instrumentation.playws;
+package datadog.trace.instrumentation.playws2;
import static datadog.trace.agent.tooling.ByteBuddyElementMatchers.safeHasSuperType;
import static datadog.trace.instrumentation.api.AgentTracer.propagate;
import static datadog.trace.instrumentation.api.AgentTracer.startSpan;
-import static datadog.trace.instrumentation.playws.HeadersInjectAdapter.SETTER;
-import static datadog.trace.instrumentation.playws.PlayWSClientDecorator.DECORATE;
+import static datadog.trace.instrumentation.playws2.HeadersInjectAdapter.SETTER;
+import static datadog.trace.instrumentation.playws2.PlayWSClientDecorator.DECORATE;
import static java.util.Collections.singletonMap;
import static net.bytebuddy.matcher.ElementMatchers.isMethod;
import static net.bytebuddy.matcher.ElementMatchers.named;

MODIFY
dd-java-agent/instrumentation/play-ws-2/src/test/groovy/PlayWSClientTest.groovy
dd-java-agent/instrumentation/play-ws-2/src/test/groovy/PlayWSClientTest.groovy
@@ -2,7 +2,7 @@ import akka.actor.ActorSystem
import akka.stream.ActorMaterializer
import akka.stream.ActorMaterializerSettings
import datadog.trace.agent.test.base.HttpClientTest
-import datadog.trace.instrumentation.playws.PlayWSClientDecorator
+import datadog.trace.instrumentation.playws2.PlayWSClientDecorator
import play.libs.ws.StandaloneWSClient
import play.libs.ws.StandaloneWSRequest
import play.libs.ws.StandaloneWSResponse

Move play-ws-1 and play-ws-2 into separate packages