More module renames (#610)

instrumentation/akka-http-10.0/akka-http-10.0.gradle

@@ -78,7 +78,7 @@ dependencies {
 
   testCompile group: 'com.typesafe.akka', name: 'akka-http_2.11', version: '10.0.0'
   testCompile group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.6.0'
-  testCompile project(':instrumentation:trace-annotation')
+  testCompile project(':instrumentation:annotations')
 
   lagomTestCompile project(':instrumentation:akka-http-10.0')
 

instrumentation/aws-sdk/aws-sdk-2.2/aws-sdk-2.2.gradle

@@ -18,7 +18,7 @@ testSets {
 }
 
 dependencies {
-  compile project(':instrumentation-core:aws-sdk:aws-sdk-2.2-core')
+  compile project(':instrumentation-core:aws-sdk:aws-sdk-2.2')
 
   compileOnly group: 'software.amazon.awssdk', name: 'aws-core', version: '2.2.0'
 

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:elasticsearch-common')
+  compile project(':instrumentation:elasticsearch:elasticsearch-rest-common')
 
   testCompile project(':instrumentation:apache-httpclient:apache-httpclient-4.0')
   testCompile project(':instrumentation:apache-httpasyncclient-4.0')

instrumentation/elasticsearch/elasticsearch-rest-5.0/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch/rest/v5_0/Elasticsearch5RestClientInstrumentation.java

@@ -16,8 +16,8 @@
 
 package io.opentelemetry.auto.instrumentation.elasticsearch.rest.v5_0;
 
-import static io.opentelemetry.auto.instrumentation.elasticsearch.ElasticsearchRestClientDecorator.DECORATE;
-import static io.opentelemetry.auto.instrumentation.elasticsearch.ElasticsearchRestClientDecorator.TRACER;
+import static io.opentelemetry.auto.instrumentation.elasticsearch.rest.ElasticsearchRestClientDecorator.DECORATE;
+import static io.opentelemetry.auto.instrumentation.elasticsearch.rest.ElasticsearchRestClientDecorator.TRACER;
 import static io.opentelemetry.auto.tooling.matcher.NameMatchers.namedOneOf;
 import static io.opentelemetry.trace.TracingContextUtils.currentContextWith;
 import static java.util.Collections.singletonMap;
@@ -47,7 +47,7 @@ public class Elasticsearch5RestClientInstrumentation extends Instrumenter.Defaul
   @Override
   public String[] helperClassNames() {
     return new String[] {
-      "io.opentelemetry.auto.instrumentation.elasticsearch.ElasticsearchRestClientDecorator",
+      "io.opentelemetry.auto.instrumentation.elasticsearch.rest.ElasticsearchRestClientDecorator",
       packageName + ".RestResponseListener",
     };
   }

instrumentation/elasticsearch/elasticsearch-rest-5.0/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch/rest/v5_0/RestResponseListener.java

@@ -16,7 +16,7 @@
 
 package io.opentelemetry.auto.instrumentation.elasticsearch.rest.v5_0;
 
-import static io.opentelemetry.auto.instrumentation.elasticsearch.ElasticsearchRestClientDecorator.DECORATE;
+import static io.opentelemetry.auto.instrumentation.elasticsearch.rest.ElasticsearchRestClientDecorator.DECORATE;
 
 import io.opentelemetry.trace.Span;
 import org.elasticsearch.client.Response;

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:elasticsearch-common')
+  compile project(':instrumentation:elasticsearch:elasticsearch-rest-common')
 
   testCompile project(':instrumentation:apache-httpclient:apache-httpclient-4.0')
   testCompile project(':instrumentation:apache-httpasyncclient-4.0')

instrumentation/elasticsearch/elasticsearch-rest-6.4/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch/rest/v6_4/Elasticsearch6RestClientInstrumentation.java

@@ -16,8 +16,8 @@
 
 package io.opentelemetry.auto.instrumentation.elasticsearch.rest.v6_4;
 
-import static io.opentelemetry.auto.instrumentation.elasticsearch.ElasticsearchRestClientDecorator.DECORATE;
-import static io.opentelemetry.auto.instrumentation.elasticsearch.ElasticsearchRestClientDecorator.TRACER;
+import static io.opentelemetry.auto.instrumentation.elasticsearch.rest.ElasticsearchRestClientDecorator.DECORATE;
+import static io.opentelemetry.auto.instrumentation.elasticsearch.rest.ElasticsearchRestClientDecorator.TRACER;
 import static io.opentelemetry.trace.TracingContextUtils.currentContextWith;
 import static java.util.Collections.singletonMap;
 import static net.bytebuddy.matcher.ElementMatchers.isMethod;
@@ -47,7 +47,7 @@ public class Elasticsearch6RestClientInstrumentation extends Instrumenter.Defaul
   @Override
   public String[] helperClassNames() {
     return new String[] {
-      "io.opentelemetry.auto.instrumentation.elasticsearch.ElasticsearchRestClientDecorator",
+      "io.opentelemetry.auto.instrumentation.elasticsearch.rest.ElasticsearchRestClientDecorator",
       packageName + ".RestResponseListener",
     };
   }

instrumentation/elasticsearch/elasticsearch-rest-6.4/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch/rest/v6_4/RestResponseListener.java

@@ -16,7 +16,7 @@
 
 package io.opentelemetry.auto.instrumentation.elasticsearch.rest.v6_4;
 
-import static io.opentelemetry.auto.instrumentation.elasticsearch.ElasticsearchRestClientDecorator.DECORATE;
+import static io.opentelemetry.auto.instrumentation.elasticsearch.rest.ElasticsearchRestClientDecorator.DECORATE;
 
 import io.opentelemetry.trace.Span;
 import org.elasticsearch.client.Response;

instrumentation/elasticsearch/elasticsearch-rest-common/elasticsearch-rest-common.gradle

@@ -0,0 +1,6 @@
+apply from: "$rootDir/gradle/instrumentation.gradle"
+
+dependencies {
+  compileOnly group: 'org.elasticsearch.client', name: 'rest', version: '5.0.0'
+  compile project(':auto-tooling')
+}

instrumentation/elasticsearch/elasticsearch-rest-common/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch/rest/ElasticsearchRestClientDecorator.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.opentelemetry.auto.instrumentation.elasticsearch;
+package io.opentelemetry.auto.instrumentation.elasticsearch.rest;
 
 import io.opentelemetry.OpenTelemetry;
 import io.opentelemetry.auto.bootstrap.instrumentation.decorator.DatabaseClientDecorator;

instrumentation/elasticsearch/elasticsearch-transport-2.0/elasticsearch-transport-2.0.gradle

@@ -23,7 +23,7 @@ testSets {
 dependencies {
   compileOnly group: 'org.elasticsearch', name: 'elasticsearch', version: '2.0.0'
 
-  compile project(':instrumentation:elasticsearch:elasticsearch-common')
+  compile project(':instrumentation:elasticsearch:elasticsearch-transport-common')
 
   // Ensure no cross interference
   testCompile project(':instrumentation:elasticsearch:elasticsearch-rest-5.0')

instrumentation/elasticsearch/elasticsearch-transport-2.0/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch/transport/v2_0/Elasticsearch2TransportClientInstrumentation.java

@@ -16,8 +16,8 @@
 
 package io.opentelemetry.auto.instrumentation.elasticsearch.transport.v2_0;
 
-import static io.opentelemetry.auto.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator.DECORATE;
-import static io.opentelemetry.auto.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator.TRACER;
+import static io.opentelemetry.auto.instrumentation.elasticsearch.transport.ElasticsearchTransportClientDecorator.DECORATE;
+import static io.opentelemetry.auto.instrumentation.elasticsearch.transport.ElasticsearchTransportClientDecorator.TRACER;
 import static io.opentelemetry.trace.Span.Kind.CLIENT;
 import static io.opentelemetry.trace.TracingContextUtils.currentContextWith;
 import static java.util.Collections.singletonMap;
@@ -61,7 +61,7 @@ public class Elasticsearch2TransportClientInstrumentation extends Instrumenter.D
       "com.google.common.base.Joiner$1",
       "com.google.common.base.Joiner$2",
       "com.google.common.base.Joiner$MapJoiner",
-      "io.opentelemetry.auto.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator",
+      "io.opentelemetry.auto.instrumentation.elasticsearch.transport.ElasticsearchTransportClientDecorator",
       packageName + ".TransportActionListener",
     };
   }

instrumentation/elasticsearch/elasticsearch-transport-2.0/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch/transport/v2_0/TransportActionListener.java

@@ -16,7 +16,7 @@
 
 package io.opentelemetry.auto.instrumentation.elasticsearch.transport.v2_0;
 
-import static io.opentelemetry.auto.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator.DECORATE;
+import static io.opentelemetry.auto.instrumentation.elasticsearch.transport.ElasticsearchTransportClientDecorator.DECORATE;
 
 import com.google.common.base.Joiner;
 import io.opentelemetry.auto.instrumentation.api.MoreTags;

instrumentation/elasticsearch/elasticsearch-transport-5.0/elasticsearch-transport-5.0.gradle

@@ -23,7 +23,7 @@ muzzle {
 dependencies {
   compileOnly group: 'org.elasticsearch.client', name: 'transport', version: '5.0.0'
 
-  compile project(':instrumentation:elasticsearch:elasticsearch-common')
+  compile project(':instrumentation:elasticsearch:elasticsearch-transport-common')
 
   // Ensure no cross interference
   testCompile project(':instrumentation:elasticsearch:elasticsearch-rest-5.0')

instrumentation/elasticsearch/elasticsearch-transport-5.0/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch/transport/v5_0/Elasticsearch5TransportClientInstrumentation.java

@@ -16,8 +16,8 @@
 
 package io.opentelemetry.auto.instrumentation.elasticsearch.transport.v5_0;
 
-import static io.opentelemetry.auto.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator.DECORATE;
-import static io.opentelemetry.auto.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator.TRACER;
+import static io.opentelemetry.auto.instrumentation.elasticsearch.transport.ElasticsearchTransportClientDecorator.DECORATE;
+import static io.opentelemetry.auto.instrumentation.elasticsearch.transport.ElasticsearchTransportClientDecorator.TRACER;
 import static io.opentelemetry.trace.Span.Kind.CLIENT;
 import static io.opentelemetry.trace.TracingContextUtils.currentContextWith;
 import static java.util.Collections.singletonMap;
@@ -61,7 +61,7 @@ public class Elasticsearch5TransportClientInstrumentation extends Instrumenter.D
       "com.google.common.base.Joiner$1",
       "com.google.common.base.Joiner$2",
       "com.google.common.base.Joiner$MapJoiner",
-      "io.opentelemetry.auto.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator",
+      "io.opentelemetry.auto.instrumentation.elasticsearch.transport.ElasticsearchTransportClientDecorator",
       packageName + ".TransportActionListener",
     };
   }

instrumentation/elasticsearch/elasticsearch-transport-5.0/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch/transport/v5_0/TransportActionListener.java

@@ -16,7 +16,7 @@
 
 package io.opentelemetry.auto.instrumentation.elasticsearch.transport.v5_0;
 
-import static io.opentelemetry.auto.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator.DECORATE;
+import static io.opentelemetry.auto.instrumentation.elasticsearch.transport.ElasticsearchTransportClientDecorator.DECORATE;
 
 import com.google.common.base.Joiner;
 import io.opentelemetry.auto.instrumentation.api.MoreTags;

instrumentation/elasticsearch/elasticsearch-transport-5.3/elasticsearch-transport-5.3.gradle

@@ -30,7 +30,7 @@ testSets {
 dependencies {
   compileOnly group: 'org.elasticsearch.client', name: 'transport', version: '5.3.0'
 
-  compile project(':instrumentation:elasticsearch:elasticsearch-common')
+  compile project(':instrumentation:elasticsearch:elasticsearch-transport-common')
 
   testCompile project(':instrumentation:apache-httpasyncclient-4.0')
   testCompile project(':instrumentation:netty:netty-4.1')

instrumentation/elasticsearch/elasticsearch-transport-5.3/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch/transport/v5_3/Elasticsearch53TransportClientInstrumentation.java

@@ -16,8 +16,8 @@
 
 package io.opentelemetry.auto.instrumentation.elasticsearch.transport.v5_3;
 
-import static io.opentelemetry.auto.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator.DECORATE;
-import static io.opentelemetry.auto.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator.TRACER;
+import static io.opentelemetry.auto.instrumentation.elasticsearch.transport.ElasticsearchTransportClientDecorator.DECORATE;
+import static io.opentelemetry.auto.instrumentation.elasticsearch.transport.ElasticsearchTransportClientDecorator.TRACER;
 import static io.opentelemetry.trace.Span.Kind.CLIENT;
 import static io.opentelemetry.trace.TracingContextUtils.currentContextWith;
 import static java.util.Collections.singletonMap;
@@ -62,7 +62,7 @@ public class Elasticsearch53TransportClientInstrumentation extends Instrumenter.
       "com.google.common.base.Joiner$1",
       "com.google.common.base.Joiner$2",
       "com.google.common.base.Joiner$MapJoiner",
-      "io.opentelemetry.auto.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator",
+      "io.opentelemetry.auto.instrumentation.elasticsearch.transport.ElasticsearchTransportClientDecorator",
       packageName + ".TransportActionListener",
     };
   }

instrumentation/elasticsearch/elasticsearch-transport-5.3/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch/transport/v5_3/TransportActionListener.java

@@ -16,7 +16,7 @@
 
 package io.opentelemetry.auto.instrumentation.elasticsearch.transport.v5_3;
 
-import static io.opentelemetry.auto.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator.DECORATE;
+import static io.opentelemetry.auto.instrumentation.elasticsearch.transport.ElasticsearchTransportClientDecorator.DECORATE;
 
 import com.google.common.base.Joiner;
 import io.opentelemetry.auto.instrumentation.api.MoreTags;

instrumentation/elasticsearch/elasticsearch-transport-6.0/elasticsearch-transport-6.0.gradle

@@ -30,7 +30,7 @@ testSets {
 dependencies {
   compileOnly group: 'org.elasticsearch.client', name: 'transport', version: '6.0.0'
 
-  compile project(':instrumentation:elasticsearch:elasticsearch-common')
+  compile project(':instrumentation:elasticsearch:elasticsearch-transport-common')
 
   // Ensure no cross interference
   testCompile project(':instrumentation:elasticsearch:elasticsearch-rest-5.0')

instrumentation/elasticsearch/elasticsearch-transport-6.0/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch/transport/v6_0/Elasticsearch6TransportClientInstrumentation.java

@@ -16,8 +16,8 @@
 
 package io.opentelemetry.auto.instrumentation.elasticsearch.transport.v6_0;
 
-import static io.opentelemetry.auto.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator.DECORATE;
-import static io.opentelemetry.auto.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator.TRACER;
+import static io.opentelemetry.auto.instrumentation.elasticsearch.transport.ElasticsearchTransportClientDecorator.DECORATE;
+import static io.opentelemetry.auto.instrumentation.elasticsearch.transport.ElasticsearchTransportClientDecorator.TRACER;
 import static io.opentelemetry.trace.Span.Kind.CLIENT;
 import static io.opentelemetry.trace.TracingContextUtils.currentContextWith;
 import static java.util.Collections.singletonMap;
@@ -65,7 +65,7 @@ public class Elasticsearch6TransportClientInstrumentation extends Instrumenter.D
       "com.google.common.base.Joiner$1",
       "com.google.common.base.Joiner$2",
       "com.google.common.base.Joiner$MapJoiner",
-      "io.opentelemetry.auto.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator",
+      "io.opentelemetry.auto.instrumentation.elasticsearch.transport.ElasticsearchTransportClientDecorator",
       packageName + ".TransportActionListener",
     };
   }

instrumentation/elasticsearch/elasticsearch-transport-6.0/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch/transport/v6_0/TransportActionListener.java

@@ -16,7 +16,7 @@
 
 package io.opentelemetry.auto.instrumentation.elasticsearch.transport.v6_0;
 
-import static io.opentelemetry.auto.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator.DECORATE;
+import static io.opentelemetry.auto.instrumentation.elasticsearch.transport.ElasticsearchTransportClientDecorator.DECORATE;
 
 import com.google.common.base.Joiner;
 import io.opentelemetry.auto.instrumentation.api.MoreTags;

instrumentation/elasticsearch/elasticsearch-transport-common/elasticsearch-transport-common.gradle

@@ -1,7 +1,6 @@
 apply from: "$rootDir/gradle/instrumentation.gradle"
 
 dependencies {
-  compileOnly group: 'org.elasticsearch.client', name: 'rest', version: '5.0.0'
   compileOnly group: 'org.elasticsearch', name: 'elasticsearch', version: '2.0.0'
   compile project(':auto-tooling')
 }

instrumentation/elasticsearch/elasticsearch-transport-common/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch/transport/ElasticsearchTransportClientDecorator.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.opentelemetry.auto.instrumentation.elasticsearch;
+package io.opentelemetry.auto.instrumentation.elasticsearch.transport;
 
 import io.opentelemetry.OpenTelemetry;
 import io.opentelemetry.auto.bootstrap.instrumentation.decorator.DatabaseClientDecorator;

instrumentation/hystrix-1.4/hystrix-1.4.gradle

@@ -21,7 +21,7 @@ dependencies {
   compileOnly group: 'com.netflix.hystrix', name: 'hystrix-core', version: '1.4.0'
   compileOnly group: 'io.reactivex', name: 'rxjava', version: '1.0.7'
 
-  testCompile project(':instrumentation:trace-annotation')
+  testCompile project(':instrumentation:annotations')
 
   testCompile group: 'io.reactivex', name: 'rxjava', version: '1.0.7'
   testCompile group: 'com.netflix.hystrix', name: 'hystrix-core', version: '1.4.0'

instrumentation/instrumentation.gradle

@@ -19,6 +19,8 @@ Project instr_project = project
 subprojects {
   afterEvaluate { Project subProj ->
     if (subProj.getPlugins().hasPlugin('java')) {
+      subProj.archivesBaseName = 'opentelemetry-auto-' + subProj.archivesBaseName
+
       // Make it so all instrumentation subproject tests can be run with a single command.
       instr_project.tasks.test.dependsOn(subProj.tasks.test)
 

instrumentation/java-concurrent/akka-2.5-testing/akka-2.5-testing.gradle

@@ -14,5 +14,5 @@ dependencies {
   testCompile group: 'com.typesafe.akka', name: 'akka-actor_2.11', version: '2.5.0'
 
   testCompile project(':instrumentation:java-concurrent')
-  testCompile project(':instrumentation:trace-annotation')
+  testCompile project(':instrumentation:annotations')
 }

instrumentation/java-concurrent/akka-testing/akka-testing.gradle

@@ -10,5 +10,5 @@ dependencies {
   testCompile group: 'com.typesafe.akka', name: 'akka-testkit_2.11', version: '2.3.16'
 
   testCompile project(':instrumentation:java-concurrent')
-  testCompile project(':instrumentation:trace-annotation')
+  testCompile project(':instrumentation:annotations')
 }

instrumentation/java-concurrent/java-concurrent.gradle

@@ -23,10 +23,10 @@ dependencies {
   // This is needed for Akka ForJoinTask/Pool instrumentation
   compileOnly group: 'com.typesafe.akka', name: 'akka-actor_2.11', version: '2.5.0'
 
-  testCompile project(':instrumentation:trace-annotation')
+  testCompile project(':instrumentation:annotations')
 
   slickTestCompile project(':instrumentation:java-concurrent')
-  slickTestCompile project(':instrumentation:trace-annotation')
+  slickTestCompile project(':instrumentation:annotations')
   slickTestCompile project(':instrumentation:jdbc')
   slickTestCompile deps.scala
   slickTestCompile group: 'com.typesafe.slick', name: 'slick_2.11', version: '3.2.0'

instrumentation/java-concurrent/kotlin-testing/kotlin-testing.gradle

@@ -7,5 +7,5 @@ dependencies {
   testCompile deps.coroutines
 
   testCompile project(':instrumentation:java-concurrent')
-  testCompile project(':instrumentation:trace-annotation')
+  testCompile project(':instrumentation:annotations')
 }

instrumentation/java-concurrent/scala-testing/scala-testing.gradle

@@ -8,5 +8,5 @@ dependencies {
   testCompile deps.scala
 
   testCompile project(':instrumentation:java-concurrent')
-  testCompile project(':instrumentation:trace-annotation')
+  testCompile project(':instrumentation:annotations')
 }

instrumentation/netty/netty-4.1/netty-4.1.gradle

@@ -41,7 +41,7 @@ testSets {
 dependencies {
   compileOnly group: 'io.netty', name: 'netty-codec-http', version: '4.1.0.Final'
 
-  testCompile project(':instrumentation:trace-annotation')
+  testCompile project(':instrumentation:annotations')
   testCompile group: 'io.netty', name: 'netty-codec-http', version: '4.1.0.Final'
   testCompile group: 'org.asynchttpclient', name: 'async-http-client', version: '2.1.0'
 

instrumentation/reactor-3.1/reactor-3.1.gradle

@@ -25,7 +25,7 @@ testSets {
 dependencies {
   compileOnly group: 'io.projectreactor', name: 'reactor-core', version: '3.1.0.RELEASE'
 
-  testCompile project(':instrumentation:trace-annotation')
+  testCompile project(':instrumentation:annotations')
 
   testCompile group: 'io.projectreactor', name: 'reactor-core', version: '3.1.0.RELEASE'
 

instrumentation/spring-webflux-5.0/spring-webflux-5.0.gradle

@@ -33,7 +33,7 @@ dependencies {
   compileOnly group: 'org.springframework', name: 'spring-webflux', version: '5.0.0.RELEASE'
   compileOnly group: 'io.projectreactor.ipc', name: 'reactor-netty', version: '0.7.0.RELEASE'
 
-  testCompile project(':instrumentation:trace-annotation')
+  testCompile project(':instrumentation:annotations')
   testCompile project(':instrumentation:netty:netty-4.1')
   testCompile project(':instrumentation:reactor-3.1')
 

instrumentation/vertx-3.0/vertx-3.0.gradle

@@ -29,7 +29,7 @@ dependencies {
   testCompile project(':instrumentation:netty:netty-4.0')
   testCompile project(':instrumentation:netty:netty-4.1')
   testCompile project(':instrumentation:jdbc')
-  testCompile project(':instrumentation:trace-annotation')
+  testCompile project(':instrumentation:annotations')
 
   testCompile group: 'io.vertx', name: 'vertx-web', version: vertxVersion
   testCompile group: 'io.vertx', name: 'vertx-jdbc-client', version: vertxVersion

instrumentation/vertx-reactive-3.5/vertx-reactive-3.5.gradle

@@ -28,8 +28,8 @@ dependencies {
 
   testCompile project(':instrumentation:jdbc')
   testCompile project(':instrumentation:netty:netty-4.1')
-  testCompile project(':instrumentation:trace-annotation')
-  testCompile project(':instrumentation:vertx')
+  testCompile project(':instrumentation:annotations')
+  testCompile project(':instrumentation:vertx-3.0')
 
   testCompile group: 'io.vertx', name: 'vertx-web', version: vertxVersion
   testCompile group: 'io.vertx', name: 'vertx-web-client', version: vertxVersion

settings.gradle

@@ -42,6 +42,7 @@ include ':smoke-tests:springboot'
 
 // instrumentation:
 include ':instrumentation:akka-http-10.0'
+include ':instrumentation:annotations'
 include ':instrumentation:apache-httpasyncclient-4.0'
 include ':instrumentation:apache-httpclient:apache-httpclient-2.0'
 include ':instrumentation:apache-httpclient:apache-httpclient-4.0'
@@ -54,9 +55,10 @@ 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:elasticsearch-common'
+include ':instrumentation:elasticsearch:elasticsearch-rest-common'
 include ':instrumentation:elasticsearch:elasticsearch-rest-5.0'
 include ':instrumentation:elasticsearch:elasticsearch-rest-6.4'
+include ':instrumentation:elasticsearch:elasticsearch-transport-common'
 include ':instrumentation:elasticsearch:elasticsearch-transport-2.0'
 include ':instrumentation:elasticsearch:elasticsearch-transport-5.0'
 include ':instrumentation:elasticsearch:elasticsearch-transport-5.3'
@@ -145,12 +147,11 @@ include ':instrumentation:spring-scheduling-3.1'
 include ':instrumentation:spring-webmvc-3.1'
 include ':instrumentation:spring-webflux-5.0'
 include ':instrumentation:spymemcached-2.12'
-include ':instrumentation:trace-annotation'
 include ':instrumentation:twilio-6.6'
-include ':instrumentation:vertx'
-include ':instrumentation:vertx-reactive'
+include ':instrumentation:vertx-3.0'
+include ':instrumentation:vertx-reactive-3.5'
 
-include ':instrumentation-core:aws-sdk:aws-sdk-2.2-core'
+include ':instrumentation-core:aws-sdk:aws-sdk-2.2'
 include ':instrumentation-core:spring'
 
 // exporter adapters

testing/testing.gradle

@@ -44,7 +44,7 @@ dependencies {
 
   implementation deps.groovy
 
-  testImplementation project(':instrumentation:trace-annotation')
+  testImplementation project(':instrumentation:annotations')
 
   //TODO replace with Otel WithSpan
   testImplementation('io.opentracing.contrib.dropwizard:dropwizard-opentracing:0.2.2') {