From e5b83218ae82de14b22c9433236ed1e1301ac9b3 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Tue, 10 Mar 2020 16:51:07 -0700 Subject: [PATCH] Rename elasticsearch modules (#221) --- .../elasticsearch-common.gradle} | 0 .../ElasticsearchRestClientDecorator.java | 0 .../ElasticsearchTransportClientDecorator.java | 0 .../elasticsearch-rest-5.0.gradle} | 2 +- .../groovy/Elasticsearch6RestClientTest.groovy | 0 .../Elasticsearch5RestClientInstrumentation.java | 0 .../elasticsearch5/RestResponseListener.java | 0 .../groovy/Elasticsearch5RestClientTest.groovy | 0 .../elasticsearch-rest-6.4.gradle} | 2 +- .../groovy/Elasticsearch6RestClientTest.groovy | 0 .../Elasticsearch6RestClientInstrumentation.java | 0 .../elasticsearch6_4/RestResponseListener.java | 0 .../groovy/Elasticsearch6RestClientTest.groovy | 0 .../elasticsearch-transport-2.0.gradle} | 6 +++--- .../groovy/Elasticsearch2NodeClientTest.groovy | 0 .../Elasticsearch2TransportClientTest.groovy | 0 .../latestDepTest/groovy/springdata/Config.groovy | 0 .../src/latestDepTest/groovy/springdata/Doc.groovy | 0 .../groovy/springdata/DocRepository.groovy | 0 .../Elasticsearch2SpringRepositoryTest.groovy | 0 .../Elasticsearch2SpringTemplateTest.groovy | 0 ...asticsearch2TransportClientInstrumentation.java | 0 .../elasticsearch2/TransportActionListener.java | 0 .../groovy/Elasticsearch2NodeClientTest.groovy | 0 .../Elasticsearch2TransportClientTest.groovy | 0 .../src/test/groovy/springdata/Config.groovy | 0 .../src/test/groovy/springdata/Doc.groovy | 0 .../test/groovy/springdata/DocRepository.groovy | 0 .../Elasticsearch2SpringRepositoryTest.groovy | 0 .../Elasticsearch2SpringTemplateTest.groovy | 0 .../elasticsearch-transport-5.0.gradle} | 4 ++-- ...asticsearch5TransportClientInstrumentation.java | 0 .../elasticsearch5/TransportActionListener.java | 0 .../groovy/Elasticsearch5NodeClientTest.groovy | 0 .../Elasticsearch5TransportClientTest.groovy | 0 .../elasticsearch-transport-5.3.gradle} | 2 +- ...sticsearch53TransportClientInstrumentation.java | 0 .../elasticsearch5_3/TransportActionListener.java | 0 .../groovy/Elasticsearch53NodeClientTest.groovy | 0 .../Elasticsearch53TransportClientTest.groovy | 0 .../src/test/groovy/springdata/Config.groovy | 0 .../src/test/groovy/springdata/Doc.groovy | 0 .../test/groovy/springdata/DocRepository.groovy | 0 .../Elasticsearch53SpringRepositoryTest.groovy | 0 .../Elasticsearch53SpringTemplateTest.groovy | 0 .../elasticsearch-transport-6.0.gradle} | 4 ++-- ...asticsearch6TransportClientInstrumentation.java | 0 .../elasticsearch6/TransportActionListener.java | 0 .../groovy/Elasticsearch6NodeClientTest.groovy | 0 .../Elasticsearch6TransportClientTest.groovy | 0 settings.gradle | 14 +++++++------- 51 files changed, 17 insertions(+), 17 deletions(-) rename instrumentation/elasticsearch/{elasticsearch.gradle => elasticsearch-common/elasticsearch-common.gradle} (100%) rename instrumentation/elasticsearch/{ => elasticsearch-common}/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch/ElasticsearchRestClientDecorator.java (100%) rename instrumentation/elasticsearch/{ => elasticsearch-common}/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch/ElasticsearchTransportClientDecorator.java (100%) rename instrumentation/elasticsearch/{rest-5.0/rest-5.0.gradle => elasticsearch-rest-5.0/elasticsearch-rest-5.0.gradle} (95%) rename instrumentation/elasticsearch/{rest-5.0 => elasticsearch-rest-5.0}/src/latestDepTest/groovy/Elasticsearch6RestClientTest.groovy (100%) rename instrumentation/elasticsearch/{rest-5.0 => elasticsearch-rest-5.0}/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch5/Elasticsearch5RestClientInstrumentation.java (100%) rename instrumentation/elasticsearch/{rest-5.0 => elasticsearch-rest-5.0}/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch5/RestResponseListener.java (100%) rename instrumentation/elasticsearch/{rest-5.0 => elasticsearch-rest-5.0}/src/test/groovy/Elasticsearch5RestClientTest.groovy (100%) rename instrumentation/elasticsearch/{rest-6.4/rest-6.4.gradle => elasticsearch-rest-6.4/elasticsearch-rest-6.4.gradle} (96%) rename instrumentation/elasticsearch/{rest-6.4 => elasticsearch-rest-6.4}/src/latestDepTest/groovy/Elasticsearch6RestClientTest.groovy (100%) rename instrumentation/elasticsearch/{rest-6.4 => elasticsearch-rest-6.4}/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch6_4/Elasticsearch6RestClientInstrumentation.java (100%) rename instrumentation/elasticsearch/{rest-6.4 => elasticsearch-rest-6.4}/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch6_4/RestResponseListener.java (100%) rename instrumentation/elasticsearch/{rest-6.4 => elasticsearch-rest-6.4}/src/test/groovy/Elasticsearch6RestClientTest.groovy (100%) rename instrumentation/elasticsearch/{transport-2.0/transport-2.0.gradle => elasticsearch-transport-2.0/elasticsearch-transport-2.0.gradle} (86%) rename instrumentation/elasticsearch/{transport-2.0 => elasticsearch-transport-2.0}/src/latestDepTest/groovy/Elasticsearch2NodeClientTest.groovy (100%) rename instrumentation/elasticsearch/{transport-2.0 => elasticsearch-transport-2.0}/src/latestDepTest/groovy/Elasticsearch2TransportClientTest.groovy (100%) rename instrumentation/elasticsearch/{transport-2.0 => elasticsearch-transport-2.0}/src/latestDepTest/groovy/springdata/Config.groovy (100%) rename instrumentation/elasticsearch/{transport-2.0 => elasticsearch-transport-2.0}/src/latestDepTest/groovy/springdata/Doc.groovy (100%) rename instrumentation/elasticsearch/{transport-2.0 => elasticsearch-transport-2.0}/src/latestDepTest/groovy/springdata/DocRepository.groovy (100%) rename instrumentation/elasticsearch/{transport-2.0 => elasticsearch-transport-2.0}/src/latestDepTest/groovy/springdata/Elasticsearch2SpringRepositoryTest.groovy (100%) rename instrumentation/elasticsearch/{transport-2.0 => elasticsearch-transport-2.0}/src/latestDepTest/groovy/springdata/Elasticsearch2SpringTemplateTest.groovy (100%) rename instrumentation/elasticsearch/{transport-2.0 => elasticsearch-transport-2.0}/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch2/Elasticsearch2TransportClientInstrumentation.java (100%) rename instrumentation/elasticsearch/{transport-2.0 => elasticsearch-transport-2.0}/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch2/TransportActionListener.java (100%) rename instrumentation/elasticsearch/{transport-2.0 => elasticsearch-transport-2.0}/src/test/groovy/Elasticsearch2NodeClientTest.groovy (100%) rename instrumentation/elasticsearch/{transport-2.0 => elasticsearch-transport-2.0}/src/test/groovy/Elasticsearch2TransportClientTest.groovy (100%) rename instrumentation/elasticsearch/{transport-2.0 => elasticsearch-transport-2.0}/src/test/groovy/springdata/Config.groovy (100%) rename instrumentation/elasticsearch/{transport-2.0 => elasticsearch-transport-2.0}/src/test/groovy/springdata/Doc.groovy (100%) rename instrumentation/elasticsearch/{transport-2.0 => elasticsearch-transport-2.0}/src/test/groovy/springdata/DocRepository.groovy (100%) rename instrumentation/elasticsearch/{transport-2.0 => elasticsearch-transport-2.0}/src/test/groovy/springdata/Elasticsearch2SpringRepositoryTest.groovy (100%) rename instrumentation/elasticsearch/{transport-2.0 => elasticsearch-transport-2.0}/src/test/groovy/springdata/Elasticsearch2SpringTemplateTest.groovy (100%) rename instrumentation/elasticsearch/{transport-5.0/transport-5.0.gradle => elasticsearch-transport-5.0/elasticsearch-transport-5.0.gradle} (87%) rename instrumentation/elasticsearch/{transport-5.0 => elasticsearch-transport-5.0}/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch5/Elasticsearch5TransportClientInstrumentation.java (100%) rename instrumentation/elasticsearch/{transport-5.0 => elasticsearch-transport-5.0}/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch5/TransportActionListener.java (100%) rename instrumentation/elasticsearch/{transport-5.0 => elasticsearch-transport-5.0}/src/test/groovy/Elasticsearch5NodeClientTest.groovy (100%) rename instrumentation/elasticsearch/{transport-5.0 => elasticsearch-transport-5.0}/src/test/groovy/Elasticsearch5TransportClientTest.groovy (100%) rename instrumentation/elasticsearch/{transport-5.3/transport-5.3.gradle => elasticsearch-transport-5.3/elasticsearch-transport-5.3.gradle} (95%) rename instrumentation/elasticsearch/{transport-5.3 => elasticsearch-transport-5.3}/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch5_3/Elasticsearch53TransportClientInstrumentation.java (100%) rename instrumentation/elasticsearch/{transport-5.3 => elasticsearch-transport-5.3}/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch5_3/TransportActionListener.java (100%) rename instrumentation/elasticsearch/{transport-5.3 => elasticsearch-transport-5.3}/src/test/groovy/Elasticsearch53NodeClientTest.groovy (100%) rename instrumentation/elasticsearch/{transport-5.3 => elasticsearch-transport-5.3}/src/test/groovy/Elasticsearch53TransportClientTest.groovy (100%) rename instrumentation/elasticsearch/{transport-5.3 => elasticsearch-transport-5.3}/src/test/groovy/springdata/Config.groovy (100%) rename instrumentation/elasticsearch/{transport-5.3 => elasticsearch-transport-5.3}/src/test/groovy/springdata/Doc.groovy (100%) rename instrumentation/elasticsearch/{transport-5.3 => elasticsearch-transport-5.3}/src/test/groovy/springdata/DocRepository.groovy (100%) rename instrumentation/elasticsearch/{transport-5.3 => elasticsearch-transport-5.3}/src/test/groovy/springdata/Elasticsearch53SpringRepositoryTest.groovy (100%) rename instrumentation/elasticsearch/{transport-5.3 => elasticsearch-transport-5.3}/src/test/groovy/springdata/Elasticsearch53SpringTemplateTest.groovy (100%) rename instrumentation/elasticsearch/{transport-6.0/transport-6.0.gradle => elasticsearch-transport-6.0/elasticsearch-transport-6.0.gradle} (90%) rename instrumentation/elasticsearch/{transport-6.0 => elasticsearch-transport-6.0}/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch6/Elasticsearch6TransportClientInstrumentation.java (100%) rename instrumentation/elasticsearch/{transport-6.0 => elasticsearch-transport-6.0}/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch6/TransportActionListener.java (100%) rename instrumentation/elasticsearch/{transport-6.0 => elasticsearch-transport-6.0}/src/test/groovy/Elasticsearch6NodeClientTest.groovy (100%) rename instrumentation/elasticsearch/{transport-6.0 => elasticsearch-transport-6.0}/src/test/groovy/Elasticsearch6TransportClientTest.groovy (100%) diff --git a/instrumentation/elasticsearch/elasticsearch.gradle b/instrumentation/elasticsearch/elasticsearch-common/elasticsearch-common.gradle similarity index 100% rename from instrumentation/elasticsearch/elasticsearch.gradle rename to instrumentation/elasticsearch/elasticsearch-common/elasticsearch-common.gradle diff --git a/instrumentation/elasticsearch/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch/ElasticsearchRestClientDecorator.java b/instrumentation/elasticsearch/elasticsearch-common/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch/ElasticsearchRestClientDecorator.java similarity index 100% rename from instrumentation/elasticsearch/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch/ElasticsearchRestClientDecorator.java rename to instrumentation/elasticsearch/elasticsearch-common/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch/ElasticsearchRestClientDecorator.java diff --git a/instrumentation/elasticsearch/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch/ElasticsearchTransportClientDecorator.java b/instrumentation/elasticsearch/elasticsearch-common/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch/ElasticsearchTransportClientDecorator.java similarity index 100% rename from instrumentation/elasticsearch/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch/ElasticsearchTransportClientDecorator.java rename to instrumentation/elasticsearch/elasticsearch-common/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch/ElasticsearchTransportClientDecorator.java diff --git a/instrumentation/elasticsearch/rest-5.0/rest-5.0.gradle b/instrumentation/elasticsearch/elasticsearch-rest-5.0/elasticsearch-rest-5.0.gradle similarity index 95% rename from instrumentation/elasticsearch/rest-5.0/rest-5.0.gradle rename to instrumentation/elasticsearch/elasticsearch-rest-5.0/elasticsearch-rest-5.0.gradle index 69cfd659cd..c0064b215a 100644 --- a/instrumentation/elasticsearch/rest-5.0/rest-5.0.gradle +++ b/instrumentation/elasticsearch/elasticsearch-rest-5.0/elasticsearch-rest-5.0.gradle @@ -28,7 +28,7 @@ testSets { dependencies { compileOnly group: 'org.elasticsearch.client', name: 'rest', version: '5.0.0' - compile project(':instrumentation:elasticsearch') + compile project(':instrumentation:elasticsearch:elasticsearch-common') testCompile project(':instrumentation:apache-httpclient:apache-httpclient-4.0') testCompile project(':instrumentation:apache-httpasyncclient-4.0') diff --git a/instrumentation/elasticsearch/rest-5.0/src/latestDepTest/groovy/Elasticsearch6RestClientTest.groovy b/instrumentation/elasticsearch/elasticsearch-rest-5.0/src/latestDepTest/groovy/Elasticsearch6RestClientTest.groovy similarity index 100% rename from instrumentation/elasticsearch/rest-5.0/src/latestDepTest/groovy/Elasticsearch6RestClientTest.groovy rename to instrumentation/elasticsearch/elasticsearch-rest-5.0/src/latestDepTest/groovy/Elasticsearch6RestClientTest.groovy diff --git a/instrumentation/elasticsearch/rest-5.0/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch5/Elasticsearch5RestClientInstrumentation.java b/instrumentation/elasticsearch/elasticsearch-rest-5.0/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch5/Elasticsearch5RestClientInstrumentation.java similarity index 100% rename from instrumentation/elasticsearch/rest-5.0/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch5/Elasticsearch5RestClientInstrumentation.java rename to instrumentation/elasticsearch/elasticsearch-rest-5.0/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch5/Elasticsearch5RestClientInstrumentation.java diff --git a/instrumentation/elasticsearch/rest-5.0/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch5/RestResponseListener.java b/instrumentation/elasticsearch/elasticsearch-rest-5.0/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch5/RestResponseListener.java similarity index 100% rename from instrumentation/elasticsearch/rest-5.0/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch5/RestResponseListener.java rename to instrumentation/elasticsearch/elasticsearch-rest-5.0/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch5/RestResponseListener.java diff --git a/instrumentation/elasticsearch/rest-5.0/src/test/groovy/Elasticsearch5RestClientTest.groovy b/instrumentation/elasticsearch/elasticsearch-rest-5.0/src/test/groovy/Elasticsearch5RestClientTest.groovy similarity index 100% rename from instrumentation/elasticsearch/rest-5.0/src/test/groovy/Elasticsearch5RestClientTest.groovy rename to instrumentation/elasticsearch/elasticsearch-rest-5.0/src/test/groovy/Elasticsearch5RestClientTest.groovy diff --git a/instrumentation/elasticsearch/rest-6.4/rest-6.4.gradle b/instrumentation/elasticsearch/elasticsearch-rest-6.4/elasticsearch-rest-6.4.gradle similarity index 96% rename from instrumentation/elasticsearch/rest-6.4/rest-6.4.gradle rename to instrumentation/elasticsearch/elasticsearch-rest-6.4/elasticsearch-rest-6.4.gradle index 56397e2c97..6bc9fa567b 100644 --- a/instrumentation/elasticsearch/rest-6.4/rest-6.4.gradle +++ b/instrumentation/elasticsearch/elasticsearch-rest-6.4/elasticsearch-rest-6.4.gradle @@ -29,7 +29,7 @@ testSets { dependencies { compileOnly group: 'org.elasticsearch.client', name: 'elasticsearch-rest-client', version: '6.4.0' - compile project(':instrumentation:elasticsearch') + compile project(':instrumentation:elasticsearch:elasticsearch-common') testCompile project(':instrumentation:apache-httpclient:apache-httpclient-4.0') testCompile project(':instrumentation:apache-httpasyncclient-4.0') diff --git a/instrumentation/elasticsearch/rest-6.4/src/latestDepTest/groovy/Elasticsearch6RestClientTest.groovy b/instrumentation/elasticsearch/elasticsearch-rest-6.4/src/latestDepTest/groovy/Elasticsearch6RestClientTest.groovy similarity index 100% rename from instrumentation/elasticsearch/rest-6.4/src/latestDepTest/groovy/Elasticsearch6RestClientTest.groovy rename to instrumentation/elasticsearch/elasticsearch-rest-6.4/src/latestDepTest/groovy/Elasticsearch6RestClientTest.groovy diff --git a/instrumentation/elasticsearch/rest-6.4/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch6_4/Elasticsearch6RestClientInstrumentation.java b/instrumentation/elasticsearch/elasticsearch-rest-6.4/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch6_4/Elasticsearch6RestClientInstrumentation.java similarity index 100% rename from instrumentation/elasticsearch/rest-6.4/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch6_4/Elasticsearch6RestClientInstrumentation.java rename to instrumentation/elasticsearch/elasticsearch-rest-6.4/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch6_4/Elasticsearch6RestClientInstrumentation.java diff --git a/instrumentation/elasticsearch/rest-6.4/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch6_4/RestResponseListener.java b/instrumentation/elasticsearch/elasticsearch-rest-6.4/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch6_4/RestResponseListener.java similarity index 100% rename from instrumentation/elasticsearch/rest-6.4/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch6_4/RestResponseListener.java rename to instrumentation/elasticsearch/elasticsearch-rest-6.4/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch6_4/RestResponseListener.java diff --git a/instrumentation/elasticsearch/rest-6.4/src/test/groovy/Elasticsearch6RestClientTest.groovy b/instrumentation/elasticsearch/elasticsearch-rest-6.4/src/test/groovy/Elasticsearch6RestClientTest.groovy similarity index 100% rename from instrumentation/elasticsearch/rest-6.4/src/test/groovy/Elasticsearch6RestClientTest.groovy rename to instrumentation/elasticsearch/elasticsearch-rest-6.4/src/test/groovy/Elasticsearch6RestClientTest.groovy diff --git a/instrumentation/elasticsearch/transport-2.0/transport-2.0.gradle b/instrumentation/elasticsearch/elasticsearch-transport-2.0/elasticsearch-transport-2.0.gradle similarity index 86% rename from instrumentation/elasticsearch/transport-2.0/transport-2.0.gradle rename to instrumentation/elasticsearch/elasticsearch-transport-2.0/elasticsearch-transport-2.0.gradle index 28fac27012..ddbbe54753 100644 --- a/instrumentation/elasticsearch/transport-2.0/transport-2.0.gradle +++ b/instrumentation/elasticsearch/elasticsearch-transport-2.0/elasticsearch-transport-2.0.gradle @@ -23,11 +23,11 @@ testSets { dependencies { compileOnly group: 'org.elasticsearch', name: 'elasticsearch', version: '2.0.0' - compile project(':instrumentation:elasticsearch') + compile project(':instrumentation:elasticsearch:elasticsearch-common') // Ensure no cross interference - testCompile project(':instrumentation:elasticsearch:rest-5.0') - testCompile project(':instrumentation:elasticsearch:transport-5.0') + testCompile project(':instrumentation:elasticsearch:elasticsearch-rest-5.0') + testCompile project(':instrumentation:elasticsearch:elasticsearch-transport-5.0') testCompile project(':instrumentation:apache-httpasyncclient-4.0') testCompile group: 'org.elasticsearch', name: 'elasticsearch', version: '2.0.0' diff --git a/instrumentation/elasticsearch/transport-2.0/src/latestDepTest/groovy/Elasticsearch2NodeClientTest.groovy b/instrumentation/elasticsearch/elasticsearch-transport-2.0/src/latestDepTest/groovy/Elasticsearch2NodeClientTest.groovy similarity index 100% rename from instrumentation/elasticsearch/transport-2.0/src/latestDepTest/groovy/Elasticsearch2NodeClientTest.groovy rename to instrumentation/elasticsearch/elasticsearch-transport-2.0/src/latestDepTest/groovy/Elasticsearch2NodeClientTest.groovy diff --git a/instrumentation/elasticsearch/transport-2.0/src/latestDepTest/groovy/Elasticsearch2TransportClientTest.groovy b/instrumentation/elasticsearch/elasticsearch-transport-2.0/src/latestDepTest/groovy/Elasticsearch2TransportClientTest.groovy similarity index 100% rename from instrumentation/elasticsearch/transport-2.0/src/latestDepTest/groovy/Elasticsearch2TransportClientTest.groovy rename to instrumentation/elasticsearch/elasticsearch-transport-2.0/src/latestDepTest/groovy/Elasticsearch2TransportClientTest.groovy diff --git a/instrumentation/elasticsearch/transport-2.0/src/latestDepTest/groovy/springdata/Config.groovy b/instrumentation/elasticsearch/elasticsearch-transport-2.0/src/latestDepTest/groovy/springdata/Config.groovy similarity index 100% rename from instrumentation/elasticsearch/transport-2.0/src/latestDepTest/groovy/springdata/Config.groovy rename to instrumentation/elasticsearch/elasticsearch-transport-2.0/src/latestDepTest/groovy/springdata/Config.groovy diff --git a/instrumentation/elasticsearch/transport-2.0/src/latestDepTest/groovy/springdata/Doc.groovy b/instrumentation/elasticsearch/elasticsearch-transport-2.0/src/latestDepTest/groovy/springdata/Doc.groovy similarity index 100% rename from instrumentation/elasticsearch/transport-2.0/src/latestDepTest/groovy/springdata/Doc.groovy rename to instrumentation/elasticsearch/elasticsearch-transport-2.0/src/latestDepTest/groovy/springdata/Doc.groovy diff --git a/instrumentation/elasticsearch/transport-2.0/src/latestDepTest/groovy/springdata/DocRepository.groovy b/instrumentation/elasticsearch/elasticsearch-transport-2.0/src/latestDepTest/groovy/springdata/DocRepository.groovy similarity index 100% rename from instrumentation/elasticsearch/transport-2.0/src/latestDepTest/groovy/springdata/DocRepository.groovy rename to instrumentation/elasticsearch/elasticsearch-transport-2.0/src/latestDepTest/groovy/springdata/DocRepository.groovy diff --git a/instrumentation/elasticsearch/transport-2.0/src/latestDepTest/groovy/springdata/Elasticsearch2SpringRepositoryTest.groovy b/instrumentation/elasticsearch/elasticsearch-transport-2.0/src/latestDepTest/groovy/springdata/Elasticsearch2SpringRepositoryTest.groovy similarity index 100% rename from instrumentation/elasticsearch/transport-2.0/src/latestDepTest/groovy/springdata/Elasticsearch2SpringRepositoryTest.groovy rename to instrumentation/elasticsearch/elasticsearch-transport-2.0/src/latestDepTest/groovy/springdata/Elasticsearch2SpringRepositoryTest.groovy diff --git a/instrumentation/elasticsearch/transport-2.0/src/latestDepTest/groovy/springdata/Elasticsearch2SpringTemplateTest.groovy b/instrumentation/elasticsearch/elasticsearch-transport-2.0/src/latestDepTest/groovy/springdata/Elasticsearch2SpringTemplateTest.groovy similarity index 100% rename from instrumentation/elasticsearch/transport-2.0/src/latestDepTest/groovy/springdata/Elasticsearch2SpringTemplateTest.groovy rename to instrumentation/elasticsearch/elasticsearch-transport-2.0/src/latestDepTest/groovy/springdata/Elasticsearch2SpringTemplateTest.groovy diff --git a/instrumentation/elasticsearch/transport-2.0/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch2/Elasticsearch2TransportClientInstrumentation.java b/instrumentation/elasticsearch/elasticsearch-transport-2.0/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch2/Elasticsearch2TransportClientInstrumentation.java similarity index 100% rename from instrumentation/elasticsearch/transport-2.0/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch2/Elasticsearch2TransportClientInstrumentation.java rename to instrumentation/elasticsearch/elasticsearch-transport-2.0/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch2/Elasticsearch2TransportClientInstrumentation.java diff --git a/instrumentation/elasticsearch/transport-2.0/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch2/TransportActionListener.java b/instrumentation/elasticsearch/elasticsearch-transport-2.0/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch2/TransportActionListener.java similarity index 100% rename from instrumentation/elasticsearch/transport-2.0/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch2/TransportActionListener.java rename to instrumentation/elasticsearch/elasticsearch-transport-2.0/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch2/TransportActionListener.java diff --git a/instrumentation/elasticsearch/transport-2.0/src/test/groovy/Elasticsearch2NodeClientTest.groovy b/instrumentation/elasticsearch/elasticsearch-transport-2.0/src/test/groovy/Elasticsearch2NodeClientTest.groovy similarity index 100% rename from instrumentation/elasticsearch/transport-2.0/src/test/groovy/Elasticsearch2NodeClientTest.groovy rename to instrumentation/elasticsearch/elasticsearch-transport-2.0/src/test/groovy/Elasticsearch2NodeClientTest.groovy diff --git a/instrumentation/elasticsearch/transport-2.0/src/test/groovy/Elasticsearch2TransportClientTest.groovy b/instrumentation/elasticsearch/elasticsearch-transport-2.0/src/test/groovy/Elasticsearch2TransportClientTest.groovy similarity index 100% rename from instrumentation/elasticsearch/transport-2.0/src/test/groovy/Elasticsearch2TransportClientTest.groovy rename to instrumentation/elasticsearch/elasticsearch-transport-2.0/src/test/groovy/Elasticsearch2TransportClientTest.groovy diff --git a/instrumentation/elasticsearch/transport-2.0/src/test/groovy/springdata/Config.groovy b/instrumentation/elasticsearch/elasticsearch-transport-2.0/src/test/groovy/springdata/Config.groovy similarity index 100% rename from instrumentation/elasticsearch/transport-2.0/src/test/groovy/springdata/Config.groovy rename to instrumentation/elasticsearch/elasticsearch-transport-2.0/src/test/groovy/springdata/Config.groovy diff --git a/instrumentation/elasticsearch/transport-2.0/src/test/groovy/springdata/Doc.groovy b/instrumentation/elasticsearch/elasticsearch-transport-2.0/src/test/groovy/springdata/Doc.groovy similarity index 100% rename from instrumentation/elasticsearch/transport-2.0/src/test/groovy/springdata/Doc.groovy rename to instrumentation/elasticsearch/elasticsearch-transport-2.0/src/test/groovy/springdata/Doc.groovy diff --git a/instrumentation/elasticsearch/transport-2.0/src/test/groovy/springdata/DocRepository.groovy b/instrumentation/elasticsearch/elasticsearch-transport-2.0/src/test/groovy/springdata/DocRepository.groovy similarity index 100% rename from instrumentation/elasticsearch/transport-2.0/src/test/groovy/springdata/DocRepository.groovy rename to instrumentation/elasticsearch/elasticsearch-transport-2.0/src/test/groovy/springdata/DocRepository.groovy diff --git a/instrumentation/elasticsearch/transport-2.0/src/test/groovy/springdata/Elasticsearch2SpringRepositoryTest.groovy b/instrumentation/elasticsearch/elasticsearch-transport-2.0/src/test/groovy/springdata/Elasticsearch2SpringRepositoryTest.groovy similarity index 100% rename from instrumentation/elasticsearch/transport-2.0/src/test/groovy/springdata/Elasticsearch2SpringRepositoryTest.groovy rename to instrumentation/elasticsearch/elasticsearch-transport-2.0/src/test/groovy/springdata/Elasticsearch2SpringRepositoryTest.groovy diff --git a/instrumentation/elasticsearch/transport-2.0/src/test/groovy/springdata/Elasticsearch2SpringTemplateTest.groovy b/instrumentation/elasticsearch/elasticsearch-transport-2.0/src/test/groovy/springdata/Elasticsearch2SpringTemplateTest.groovy similarity index 100% rename from instrumentation/elasticsearch/transport-2.0/src/test/groovy/springdata/Elasticsearch2SpringTemplateTest.groovy rename to instrumentation/elasticsearch/elasticsearch-transport-2.0/src/test/groovy/springdata/Elasticsearch2SpringTemplateTest.groovy diff --git a/instrumentation/elasticsearch/transport-5.0/transport-5.0.gradle b/instrumentation/elasticsearch/elasticsearch-transport-5.0/elasticsearch-transport-5.0.gradle similarity index 87% rename from instrumentation/elasticsearch/transport-5.0/transport-5.0.gradle rename to instrumentation/elasticsearch/elasticsearch-transport-5.0/elasticsearch-transport-5.0.gradle index 35adbcb44a..d31e48a004 100644 --- a/instrumentation/elasticsearch/transport-5.0/transport-5.0.gradle +++ b/instrumentation/elasticsearch/elasticsearch-transport-5.0/elasticsearch-transport-5.0.gradle @@ -24,10 +24,10 @@ muzzle { dependencies { compileOnly group: 'org.elasticsearch.client', name: 'transport', version: '5.0.0' - compile project(':instrumentation:elasticsearch') + compile project(':instrumentation:elasticsearch:elasticsearch-common') // Ensure no cross interference - testCompile project(':instrumentation:elasticsearch:rest-5.0') + testCompile project(':instrumentation:elasticsearch:elasticsearch-rest-5.0') testCompile project(':instrumentation:apache-httpasyncclient-4.0') testCompile project(':instrumentation:netty:netty-4.1') diff --git a/instrumentation/elasticsearch/transport-5.0/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch5/Elasticsearch5TransportClientInstrumentation.java b/instrumentation/elasticsearch/elasticsearch-transport-5.0/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch5/Elasticsearch5TransportClientInstrumentation.java similarity index 100% rename from instrumentation/elasticsearch/transport-5.0/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch5/Elasticsearch5TransportClientInstrumentation.java rename to instrumentation/elasticsearch/elasticsearch-transport-5.0/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch5/Elasticsearch5TransportClientInstrumentation.java diff --git a/instrumentation/elasticsearch/transport-5.0/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch5/TransportActionListener.java b/instrumentation/elasticsearch/elasticsearch-transport-5.0/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch5/TransportActionListener.java similarity index 100% rename from instrumentation/elasticsearch/transport-5.0/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch5/TransportActionListener.java rename to instrumentation/elasticsearch/elasticsearch-transport-5.0/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch5/TransportActionListener.java diff --git a/instrumentation/elasticsearch/transport-5.0/src/test/groovy/Elasticsearch5NodeClientTest.groovy b/instrumentation/elasticsearch/elasticsearch-transport-5.0/src/test/groovy/Elasticsearch5NodeClientTest.groovy similarity index 100% rename from instrumentation/elasticsearch/transport-5.0/src/test/groovy/Elasticsearch5NodeClientTest.groovy rename to instrumentation/elasticsearch/elasticsearch-transport-5.0/src/test/groovy/Elasticsearch5NodeClientTest.groovy diff --git a/instrumentation/elasticsearch/transport-5.0/src/test/groovy/Elasticsearch5TransportClientTest.groovy b/instrumentation/elasticsearch/elasticsearch-transport-5.0/src/test/groovy/Elasticsearch5TransportClientTest.groovy similarity index 100% rename from instrumentation/elasticsearch/transport-5.0/src/test/groovy/Elasticsearch5TransportClientTest.groovy rename to instrumentation/elasticsearch/elasticsearch-transport-5.0/src/test/groovy/Elasticsearch5TransportClientTest.groovy diff --git a/instrumentation/elasticsearch/transport-5.3/transport-5.3.gradle b/instrumentation/elasticsearch/elasticsearch-transport-5.3/elasticsearch-transport-5.3.gradle similarity index 95% rename from instrumentation/elasticsearch/transport-5.3/transport-5.3.gradle rename to instrumentation/elasticsearch/elasticsearch-transport-5.3/elasticsearch-transport-5.3.gradle index 30e5c5b9ad..bf403acfc6 100644 --- a/instrumentation/elasticsearch/transport-5.3/transport-5.3.gradle +++ b/instrumentation/elasticsearch/elasticsearch-transport-5.3/elasticsearch-transport-5.3.gradle @@ -31,7 +31,7 @@ testSets { dependencies { compileOnly group: 'org.elasticsearch.client', name: 'transport', version: '5.3.0' - compile project(':instrumentation:elasticsearch') + compile project(':instrumentation:elasticsearch:elasticsearch-common') testCompile project(':instrumentation:apache-httpasyncclient-4.0') testCompile project(':instrumentation:netty:netty-4.1') diff --git a/instrumentation/elasticsearch/transport-5.3/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch5_3/Elasticsearch53TransportClientInstrumentation.java b/instrumentation/elasticsearch/elasticsearch-transport-5.3/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch5_3/Elasticsearch53TransportClientInstrumentation.java similarity index 100% rename from instrumentation/elasticsearch/transport-5.3/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch5_3/Elasticsearch53TransportClientInstrumentation.java rename to instrumentation/elasticsearch/elasticsearch-transport-5.3/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch5_3/Elasticsearch53TransportClientInstrumentation.java diff --git a/instrumentation/elasticsearch/transport-5.3/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch5_3/TransportActionListener.java b/instrumentation/elasticsearch/elasticsearch-transport-5.3/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch5_3/TransportActionListener.java similarity index 100% rename from instrumentation/elasticsearch/transport-5.3/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch5_3/TransportActionListener.java rename to instrumentation/elasticsearch/elasticsearch-transport-5.3/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch5_3/TransportActionListener.java diff --git a/instrumentation/elasticsearch/transport-5.3/src/test/groovy/Elasticsearch53NodeClientTest.groovy b/instrumentation/elasticsearch/elasticsearch-transport-5.3/src/test/groovy/Elasticsearch53NodeClientTest.groovy similarity index 100% rename from instrumentation/elasticsearch/transport-5.3/src/test/groovy/Elasticsearch53NodeClientTest.groovy rename to instrumentation/elasticsearch/elasticsearch-transport-5.3/src/test/groovy/Elasticsearch53NodeClientTest.groovy diff --git a/instrumentation/elasticsearch/transport-5.3/src/test/groovy/Elasticsearch53TransportClientTest.groovy b/instrumentation/elasticsearch/elasticsearch-transport-5.3/src/test/groovy/Elasticsearch53TransportClientTest.groovy similarity index 100% rename from instrumentation/elasticsearch/transport-5.3/src/test/groovy/Elasticsearch53TransportClientTest.groovy rename to instrumentation/elasticsearch/elasticsearch-transport-5.3/src/test/groovy/Elasticsearch53TransportClientTest.groovy diff --git a/instrumentation/elasticsearch/transport-5.3/src/test/groovy/springdata/Config.groovy b/instrumentation/elasticsearch/elasticsearch-transport-5.3/src/test/groovy/springdata/Config.groovy similarity index 100% rename from instrumentation/elasticsearch/transport-5.3/src/test/groovy/springdata/Config.groovy rename to instrumentation/elasticsearch/elasticsearch-transport-5.3/src/test/groovy/springdata/Config.groovy diff --git a/instrumentation/elasticsearch/transport-5.3/src/test/groovy/springdata/Doc.groovy b/instrumentation/elasticsearch/elasticsearch-transport-5.3/src/test/groovy/springdata/Doc.groovy similarity index 100% rename from instrumentation/elasticsearch/transport-5.3/src/test/groovy/springdata/Doc.groovy rename to instrumentation/elasticsearch/elasticsearch-transport-5.3/src/test/groovy/springdata/Doc.groovy diff --git a/instrumentation/elasticsearch/transport-5.3/src/test/groovy/springdata/DocRepository.groovy b/instrumentation/elasticsearch/elasticsearch-transport-5.3/src/test/groovy/springdata/DocRepository.groovy similarity index 100% rename from instrumentation/elasticsearch/transport-5.3/src/test/groovy/springdata/DocRepository.groovy rename to instrumentation/elasticsearch/elasticsearch-transport-5.3/src/test/groovy/springdata/DocRepository.groovy diff --git a/instrumentation/elasticsearch/transport-5.3/src/test/groovy/springdata/Elasticsearch53SpringRepositoryTest.groovy b/instrumentation/elasticsearch/elasticsearch-transport-5.3/src/test/groovy/springdata/Elasticsearch53SpringRepositoryTest.groovy similarity index 100% rename from instrumentation/elasticsearch/transport-5.3/src/test/groovy/springdata/Elasticsearch53SpringRepositoryTest.groovy rename to instrumentation/elasticsearch/elasticsearch-transport-5.3/src/test/groovy/springdata/Elasticsearch53SpringRepositoryTest.groovy diff --git a/instrumentation/elasticsearch/transport-5.3/src/test/groovy/springdata/Elasticsearch53SpringTemplateTest.groovy b/instrumentation/elasticsearch/elasticsearch-transport-5.3/src/test/groovy/springdata/Elasticsearch53SpringTemplateTest.groovy similarity index 100% rename from instrumentation/elasticsearch/transport-5.3/src/test/groovy/springdata/Elasticsearch53SpringTemplateTest.groovy rename to instrumentation/elasticsearch/elasticsearch-transport-5.3/src/test/groovy/springdata/Elasticsearch53SpringTemplateTest.groovy diff --git a/instrumentation/elasticsearch/transport-6.0/transport-6.0.gradle b/instrumentation/elasticsearch/elasticsearch-transport-6.0/elasticsearch-transport-6.0.gradle similarity index 90% rename from instrumentation/elasticsearch/transport-6.0/transport-6.0.gradle rename to instrumentation/elasticsearch/elasticsearch-transport-6.0/elasticsearch-transport-6.0.gradle index 0c20e0c739..381db38f41 100644 --- a/instrumentation/elasticsearch/transport-6.0/transport-6.0.gradle +++ b/instrumentation/elasticsearch/elasticsearch-transport-6.0/elasticsearch-transport-6.0.gradle @@ -31,10 +31,10 @@ testSets { dependencies { compileOnly group: 'org.elasticsearch.client', name: 'transport', version: '6.0.0' - compile project(':instrumentation:elasticsearch') + compile project(':instrumentation:elasticsearch:elasticsearch-common') // Ensure no cross interference - testCompile project(':instrumentation:elasticsearch:rest-5.0') + testCompile project(':instrumentation:elasticsearch:elasticsearch-rest-5.0') testCompile project(':instrumentation:apache-httpasyncclient-4.0') testCompile project(':instrumentation:netty:netty-4.1') diff --git a/instrumentation/elasticsearch/transport-6.0/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch6/Elasticsearch6TransportClientInstrumentation.java b/instrumentation/elasticsearch/elasticsearch-transport-6.0/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch6/Elasticsearch6TransportClientInstrumentation.java similarity index 100% rename from instrumentation/elasticsearch/transport-6.0/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch6/Elasticsearch6TransportClientInstrumentation.java rename to instrumentation/elasticsearch/elasticsearch-transport-6.0/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch6/Elasticsearch6TransportClientInstrumentation.java diff --git a/instrumentation/elasticsearch/transport-6.0/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch6/TransportActionListener.java b/instrumentation/elasticsearch/elasticsearch-transport-6.0/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch6/TransportActionListener.java similarity index 100% rename from instrumentation/elasticsearch/transport-6.0/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch6/TransportActionListener.java rename to instrumentation/elasticsearch/elasticsearch-transport-6.0/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch6/TransportActionListener.java diff --git a/instrumentation/elasticsearch/transport-6.0/src/test/groovy/Elasticsearch6NodeClientTest.groovy b/instrumentation/elasticsearch/elasticsearch-transport-6.0/src/test/groovy/Elasticsearch6NodeClientTest.groovy similarity index 100% rename from instrumentation/elasticsearch/transport-6.0/src/test/groovy/Elasticsearch6NodeClientTest.groovy rename to instrumentation/elasticsearch/elasticsearch-transport-6.0/src/test/groovy/Elasticsearch6NodeClientTest.groovy diff --git a/instrumentation/elasticsearch/transport-6.0/src/test/groovy/Elasticsearch6TransportClientTest.groovy b/instrumentation/elasticsearch/elasticsearch-transport-6.0/src/test/groovy/Elasticsearch6TransportClientTest.groovy similarity index 100% rename from instrumentation/elasticsearch/transport-6.0/src/test/groovy/Elasticsearch6TransportClientTest.groovy rename to instrumentation/elasticsearch/elasticsearch-transport-6.0/src/test/groovy/Elasticsearch6TransportClientTest.groovy diff --git a/settings.gradle b/settings.gradle index 468e27991e..9211c99a93 100644 --- a/settings.gradle +++ b/settings.gradle @@ -56,13 +56,13 @@ include ':instrumentation:couchbase:couchbase-2.0' include ':instrumentation:couchbase:couchbase-2.6' include ':instrumentation:dropwizard-views-0.7' include ':instrumentation:dropwizard-testing' -include ':instrumentation:elasticsearch' -include ':instrumentation:elasticsearch:rest-5.0' -include ':instrumentation:elasticsearch:rest-6.4' -include ':instrumentation:elasticsearch:transport-2.0' -include ':instrumentation:elasticsearch:transport-5.0' -include ':instrumentation:elasticsearch:transport-5.3' -include ':instrumentation:elasticsearch:transport-6.0' +include ':instrumentation:elasticsearch:elasticsearch-common' +include ':instrumentation:elasticsearch:elasticsearch-rest-5.0' +include ':instrumentation:elasticsearch:elasticsearch-rest-6.4' +include ':instrumentation:elasticsearch:elasticsearch-transport-2.0' +include ':instrumentation:elasticsearch:elasticsearch-transport-5.0' +include ':instrumentation:elasticsearch:elasticsearch-transport-5.3' +include ':instrumentation:elasticsearch:elasticsearch-transport-6.0' include ':instrumentation:finatra-2.9' include ':instrumentation:geode-1.4' include ':instrumentation:google-http-client-1.19'