DataDog
diff --git a/‎…strumentation/elasticsearch/build.gradle‎ ‎…search/elasticsearch-common/build.gradle‎dd-java-agent/instrumentation/elasticsearch/build.gradle renamed to dd-java-agent/instrumentation/elasticsearch/elasticsearch-common/build.gradle b/‎…strumentation/elasticsearch/build.gradle‎ ‎…search/elasticsearch-common/build.gradle‎dd-java-agent/instrumentation/elasticsearch/build.gradle renamed to dd-java-agent/instrumentation/elasticsearch/elasticsearch-common/build.gradle
diff --git a/‎…umentation/elasticsearch/gradle.lockfile‎ ‎…rch/elasticsearch-common/gradle.lockfile‎dd-java-agent/instrumentation/elasticsearch/gradle.lockfile renamed to dd-java-agent/instrumentation/elasticsearch/elasticsearch-common/gradle.lockfile b/‎…umentation/elasticsearch/gradle.lockfile‎ ‎…rch/elasticsearch-common/gradle.lockfile‎dd-java-agent/instrumentation/elasticsearch/gradle.lockfile renamed to dd-java-agent/instrumentation/elasticsearch/elasticsearch-common/gradle.lockfile
diff --git a/‎…ch/ElasticsearchRestClientDecorator.java‎ ‎…ch/ElasticsearchRestClientDecorator.java‎dd-java-agent/instrumentation/elasticsearch/src/main/java/datadog/trace/instrumentation/elasticsearch/ElasticsearchRestClientDecorator.java renamed to dd-java-agent/instrumentation/elasticsearch/elasticsearch-common/src/main/java/datadog/trace/instrumentation/elasticsearch/ElasticsearchRestClientDecorator.java b/‎…ch/ElasticsearchRestClientDecorator.java‎ ‎…ch/ElasticsearchRestClientDecorator.java‎dd-java-agent/instrumentation/elasticsearch/src/main/java/datadog/trace/instrumentation/elasticsearch/ElasticsearchRestClientDecorator.java renamed to dd-java-agent/instrumentation/elasticsearch/elasticsearch-common/src/main/java/datadog/trace/instrumentation/elasticsearch/ElasticsearchRestClientDecorator.java
diff --git a/‎…asticsearchTransportClientDecorator.java‎ ‎…asticsearchTransportClientDecorator.java‎dd-java-agent/instrumentation/elasticsearch/src/main/java/datadog/trace/instrumentation/elasticsearch/ElasticsearchTransportClientDecorator.java renamed to dd-java-agent/instrumentation/elasticsearch/elasticsearch-common/src/main/java/datadog/trace/instrumentation/elasticsearch/ElasticsearchTransportClientDecorator.java b/‎…asticsearchTransportClientDecorator.java‎ ‎…asticsearchTransportClientDecorator.java‎dd-java-agent/instrumentation/elasticsearch/src/main/java/datadog/trace/instrumentation/elasticsearch/ElasticsearchTransportClientDecorator.java renamed to dd-java-agent/instrumentation/elasticsearch/elasticsearch-common/src/main/java/datadog/trace/instrumentation/elasticsearch/ElasticsearchTransportClientDecorator.java
diff --git a/‎…tation/elasticsearch/rest-5/build.gradle‎ ‎…rest/elasticsearch-rest-5.0/build.gradle‎dd-java-agent/instrumentation/elasticsearch/rest-5/build.gradle renamed to dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-5.0/build.gradle
Lines changed: 1 addition & 1 deletion b/‎…tation/elasticsearch/rest-5/build.gradle‎ ‎…rest/elasticsearch-rest-5.0/build.gradle‎dd-java-agent/instrumentation/elasticsearch/rest-5/build.gradle renamed to dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-5.0/build.gradle
Lines changed: 1 addition & 1 deletion
diff --git a/‎…ion/elasticsearch/rest-5/gradle.lockfile‎ ‎…t/elasticsearch-rest-5.0/gradle.lockfile‎dd-java-agent/instrumentation/elasticsearch/rest-5/gradle.lockfile renamed to dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-5.0/gradle.lockfile b/‎…ion/elasticsearch/rest-5/gradle.lockfile‎ ‎…t/elasticsearch-rest-5.0/gradle.lockfile‎dd-java-agent/instrumentation/elasticsearch/rest-5/gradle.lockfile renamed to dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-5.0/gradle.lockfile
diff --git a/‎…oovy/Elasticsearch6RestClientTest.groovy‎ ‎…oovy/Elasticsearch6RestClientTest.groovy‎dd-java-agent/instrumentation/elasticsearch/rest-5/src/latestDepTest/groovy/Elasticsearch6RestClientTest.groovy renamed to dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-5.0/src/latestDepTest/groovy/Elasticsearch6RestClientTest.groovy b/‎…oovy/Elasticsearch6RestClientTest.groovy‎ ‎…oovy/Elasticsearch6RestClientTest.groovy‎dd-java-agent/instrumentation/elasticsearch/rest-5/src/latestDepTest/groovy/Elasticsearch6RestClientTest.groovy renamed to dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-5.0/src/latestDepTest/groovy/Elasticsearch6RestClientTest.groovy
diff --git a/‎…ticsearch5RestClientInstrumentation.java‎ ‎…ticsearch5RestClientInstrumentation.java‎dd-java-agent/instrumentation/elasticsearch/rest-5/src/main/java/datadog/trace/instrumentation/elasticsearch5/Elasticsearch5RestClientInstrumentation.java renamed to dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-5.0/src/main/java/datadog/trace/instrumentation/elasticsearch5/Elasticsearch5RestClientInstrumentation.java b/‎…ticsearch5RestClientInstrumentation.java‎ ‎…ticsearch5RestClientInstrumentation.java‎dd-java-agent/instrumentation/elasticsearch/rest-5/src/main/java/datadog/trace/instrumentation/elasticsearch5/Elasticsearch5RestClientInstrumentation.java renamed to dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-5.0/src/main/java/datadog/trace/instrumentation/elasticsearch5/Elasticsearch5RestClientInstrumentation.java
diff --git a/‎…elasticsearch5/RestResponseListener.java‎ ‎…elasticsearch5/RestResponseListener.java‎dd-java-agent/instrumentation/elasticsearch/rest-5/src/main/java/datadog/trace/instrumentation/elasticsearch5/RestResponseListener.java renamed to dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-5.0/src/main/java/datadog/trace/instrumentation/elasticsearch5/RestResponseListener.java b/‎…elasticsearch5/RestResponseListener.java‎ ‎…elasticsearch5/RestResponseListener.java‎dd-java-agent/instrumentation/elasticsearch/rest-5/src/main/java/datadog/trace/instrumentation/elasticsearch5/RestResponseListener.java renamed to dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-5.0/src/main/java/datadog/trace/instrumentation/elasticsearch5/RestResponseListener.java
diff --git a/‎…oovy/Elasticsearch5RestClientTest.groovy‎ ‎…oovy/Elasticsearch5RestClientTest.groovy‎dd-java-agent/instrumentation/elasticsearch/rest-5/src/test/groovy/Elasticsearch5RestClientTest.groovy renamed to dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-5.0/src/test/groovy/Elasticsearch5RestClientTest.groovy b/‎…oovy/Elasticsearch5RestClientTest.groovy‎ ‎…oovy/Elasticsearch5RestClientTest.groovy‎dd-java-agent/instrumentation/elasticsearch/rest-5/src/test/groovy/Elasticsearch5RestClientTest.groovy renamed to dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-5.0/src/test/groovy/Elasticsearch5RestClientTest.groovy
@@ -28,7 +28,7 @@ addTestSuite('latestDepTest')
 dependencies {
   compileOnly group: 'org.elasticsearch.client', name: 'rest', version: '5.0.0'
 
-  implementation project(':dd-java-agent:instrumentation:elasticsearch')
+  implementation project(':dd-java-agent:instrumentation:elasticsearch:elasticsearch-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')