DataDog
diff --git a/‎…/instrumentation/opensearch/build.gradle‎ ‎…pensearch/opensearch-common/build.gradle‎dd-java-agent/instrumentation/opensearch/build.gradle renamed to dd-java-agent/instrumentation/opensearch/opensearch-common/build.gradle b/‎…/instrumentation/opensearch/build.gradle‎ ‎…pensearch/opensearch-common/build.gradle‎dd-java-agent/instrumentation/opensearch/build.gradle renamed to dd-java-agent/instrumentation/opensearch/opensearch-common/build.gradle
diff --git a/‎…strumentation/opensearch/gradle.lockfile‎ ‎…search/opensearch-common/gradle.lockfile‎dd-java-agent/instrumentation/opensearch/gradle.lockfile renamed to dd-java-agent/instrumentation/opensearch/opensearch-common/gradle.lockfile b/‎…strumentation/opensearch/gradle.lockfile‎ ‎…search/opensearch-common/gradle.lockfile‎dd-java-agent/instrumentation/opensearch/gradle.lockfile renamed to dd-java-agent/instrumentation/opensearch/opensearch-common/gradle.lockfile
diff --git a/‎…earch/OpensearchRestClientDecorator.java‎ ‎…earch/OpensearchRestClientDecorator.java‎dd-java-agent/instrumentation/opensearch/src/main/java/datadog/trace/instrumentation/opensearch/OpensearchRestClientDecorator.java renamed to dd-java-agent/instrumentation/opensearch/opensearch-common/src/main/java/datadog/trace/instrumentation/opensearch/OpensearchRestClientDecorator.java b/‎…earch/OpensearchRestClientDecorator.java‎ ‎…earch/OpensearchRestClientDecorator.java‎dd-java-agent/instrumentation/opensearch/src/main/java/datadog/trace/instrumentation/opensearch/OpensearchRestClientDecorator.java renamed to dd-java-agent/instrumentation/opensearch/opensearch-common/src/main/java/datadog/trace/instrumentation/opensearch/OpensearchRestClientDecorator.java
diff --git a/‎…/OpensearchTransportClientDecorator.java‎ ‎…/OpensearchTransportClientDecorator.java‎dd-java-agent/instrumentation/opensearch/src/main/java/datadog/trace/instrumentation/opensearch/OpensearchTransportClientDecorator.java renamed to dd-java-agent/instrumentation/opensearch/opensearch-common/src/main/java/datadog/trace/instrumentation/opensearch/OpensearchTransportClientDecorator.java b/‎…/OpensearchTransportClientDecorator.java‎ ‎…/OpensearchTransportClientDecorator.java‎dd-java-agent/instrumentation/opensearch/src/main/java/datadog/trace/instrumentation/opensearch/OpensearchTransportClientDecorator.java renamed to dd-java-agent/instrumentation/opensearch/opensearch-common/src/main/java/datadog/trace/instrumentation/opensearch/OpensearchTransportClientDecorator.java
diff --git a/‎…rumentation/opensearch/rest/build.gradle‎ ‎…nsearch/opensearch-rest-1.0/build.gradle‎dd-java-agent/instrumentation/opensearch/rest/build.gradle renamed to dd-java-agent/instrumentation/opensearch/opensearch-rest-1.0/build.gradle
Lines changed: 1 addition & 1 deletion b/‎…rumentation/opensearch/rest/build.gradle‎ ‎…nsearch/opensearch-rest-1.0/build.gradle‎dd-java-agent/instrumentation/opensearch/rest/build.gradle renamed to dd-java-agent/instrumentation/opensearch/opensearch-rest-1.0/build.gradle
Lines changed: 1 addition & 1 deletion
diff --git a/‎…entation/opensearch/rest/gradle.lockfile‎ ‎…arch/opensearch-rest-1.0/gradle.lockfile‎dd-java-agent/instrumentation/opensearch/rest/gradle.lockfile renamed to dd-java-agent/instrumentation/opensearch/opensearch-rest-1.0/gradle.lockfile b/‎…entation/opensearch/rest/gradle.lockfile‎ ‎…arch/opensearch-rest-1.0/gradle.lockfile‎dd-java-agent/instrumentation/opensearch/rest/gradle.lockfile renamed to dd-java-agent/instrumentation/opensearch/opensearch-rest-1.0/gradle.lockfile
diff --git a/‎…OpensearchRestClientInstrumentation.java‎ ‎…OpensearchRestClientInstrumentation.java‎dd-java-agent/instrumentation/opensearch/rest/src/main/java/datadog/trace/instrumentation/opensearch/OpensearchRestClientInstrumentation.java renamed to dd-java-agent/instrumentation/opensearch/opensearch-rest-1.0/src/main/java/datadog/trace/instrumentation/opensearch/OpensearchRestClientInstrumentation.java b/‎…OpensearchRestClientInstrumentation.java‎ ‎…OpensearchRestClientInstrumentation.java‎dd-java-agent/instrumentation/opensearch/rest/src/main/java/datadog/trace/instrumentation/opensearch/OpensearchRestClientInstrumentation.java renamed to dd-java-agent/instrumentation/opensearch/opensearch-rest-1.0/src/main/java/datadog/trace/instrumentation/opensearch/OpensearchRestClientInstrumentation.java
diff --git a/‎…ion/opensearch/RestResponseListener.java‎ ‎…ion/opensearch/RestResponseListener.java‎dd-java-agent/instrumentation/opensearch/rest/src/main/java/datadog/trace/instrumentation/opensearch/RestResponseListener.java renamed to dd-java-agent/instrumentation/opensearch/opensearch-rest-1.0/src/main/java/datadog/trace/instrumentation/opensearch/RestResponseListener.java b/‎…ion/opensearch/RestResponseListener.java‎ ‎…ion/opensearch/RestResponseListener.java‎dd-java-agent/instrumentation/opensearch/rest/src/main/java/datadog/trace/instrumentation/opensearch/RestResponseListener.java renamed to dd-java-agent/instrumentation/opensearch/opensearch-rest-1.0/src/main/java/datadog/trace/instrumentation/opensearch/RestResponseListener.java
diff --git a/‎…t/groovy/OpensearchRestClientTest.groovy‎ ‎…t/groovy/OpensearchRestClientTest.groovy‎dd-java-agent/instrumentation/opensearch/rest/src/test/groovy/OpensearchRestClientTest.groovy renamed to dd-java-agent/instrumentation/opensearch/opensearch-rest-1.0/src/test/groovy/OpensearchRestClientTest.groovy b/‎…t/groovy/OpensearchRestClientTest.groovy‎ ‎…t/groovy/OpensearchRestClientTest.groovy‎dd-java-agent/instrumentation/opensearch/rest/src/test/groovy/OpensearchRestClientTest.groovy renamed to dd-java-agent/instrumentation/opensearch/opensearch-rest-1.0/src/test/groovy/OpensearchRestClientTest.groovy
diff --git a/‎…tation/opensearch/transport/build.gradle‎ ‎…ch/opensearch-transport-1.0/build.gradle‎dd-java-agent/instrumentation/opensearch/transport/build.gradle renamed to dd-java-agent/instrumentation/opensearch/opensearch-transport-1.0/build.gradle
Lines changed: 2 additions & 2 deletions b/‎…tation/opensearch/transport/build.gradle‎ ‎…ch/opensearch-transport-1.0/build.gradle‎dd-java-agent/instrumentation/opensearch/transport/build.gradle renamed to dd-java-agent/instrumentation/opensearch/opensearch-transport-1.0/build.gradle
Lines changed: 2 additions & 2 deletions
@@ -15,7 +15,7 @@ addTestSuiteForDir('latestDepTest', 'test')
 dependencies {
   compileOnly group: 'org.opensearch.client', name: 'opensearch-rest-client', version: '1.0.0'
 
-  implementation project(':dd-java-agent:instrumentation:opensearch')
+  implementation project(':dd-java-agent:instrumentation:opensearch:opensearch-common')
 
   testImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpclient-4.0')
   testImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpasyncclient-4.0')
 
@@ -23,9 +23,9 @@ addTestSuiteForDir('latestDepTest', 'test')
 dependencies {
   compileOnly group: 'org.opensearch.client', name: 'transport', version: '1.0.0'
 
-  implementation project(':dd-java-agent:instrumentation:opensearch')
+  implementation project(':dd-java-agent:instrumentation:opensearch:opensearch-common')
 
-  testImplementation project(':dd-java-agent:instrumentation:opensearch:rest')
+  testImplementation project(':dd-java-agent:instrumentation:opensearch:opensearch-rest-1.0')
   testImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpasyncclient-4.0')
   testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1')