open-telemetry · trask · Mar 6, 2020 · Mar 4, 2020 · Mar 4, 2020 · Mar 4, 2020
diff --git a/...ws-java-sdk-1.11/aws-java-sdk-1.11.gradle → ...entation/aws-sdk-1.11/aws-sdk-1.11.gradle b/...ws-java-sdk-1.11/aws-java-sdk-1.11.gradle → ...entation/aws-sdk-1.11/aws-sdk-1.11.gradle
diff --git a/...tion/aws/v0/AWSClientInstrumentation.java → ...tion/aws/v0/AWSClientInstrumentation.java b/...tion/aws/v0/AWSClientInstrumentation.java → ...tion/aws/v0/AWSClientInstrumentation.java
diff --git a/.../aws/v0/AWSHttpClientInstrumentation.java → .../aws/v0/AWSHttpClientInstrumentation.java b/.../aws/v0/AWSHttpClientInstrumentation.java → .../aws/v0/AWSHttpClientInstrumentation.java
diff --git a/...ntation/aws/v0/AwsSdkClientDecorator.java → ...ntation/aws/v0/AwsSdkClientDecorator.java b/...ntation/aws/v0/AwsSdkClientDecorator.java → ...ntation/aws/v0/AwsSdkClientDecorator.java
diff --git a/...trumentation/aws/v0/OnErrorDecorator.java → ...trumentation/aws/v0/OnErrorDecorator.java b/...trumentation/aws/v0/OnErrorDecorator.java → ...trumentation/aws/v0/OnErrorDecorator.java
diff --git a/...tation/aws/v0/RequestInstrumentation.java → ...tation/aws/v0/RequestInstrumentation.java b/...tation/aws/v0/RequestInstrumentation.java → ...tation/aws/v0/RequestInstrumentation.java
diff --git a/...o/instrumentation/aws/v0/RequestMeta.java → ...o/instrumentation/aws/v0/RequestMeta.java b/...o/instrumentation/aws/v0/RequestMeta.java → ...o/instrumentation/aws/v0/RequestMeta.java
diff --git a/...ntation/aws/v0/TracingRequestHandler.java → ...ntation/aws/v0/TracingRequestHandler.java b/...ntation/aws/v0/TracingRequestHandler.java → ...ntation/aws/v0/TracingRequestHandler.java
@@ -31,7 +31,7 @@
 /** Tracing Request Handler */
 public class TracingRequestHandler extends RequestHandler2 {
   private static final Tracer TRACER =
-      OpenTelemetry.getTracerFactory().get("io.opentelemetry.auto.aws-java-sdk-1.11");
+      OpenTelemetry.getTracerFactory().get("io.opentelemetry.auto.aws-sdk-1.11");
 
   private final AwsSdkClientDecorator decorate;
 

diff --git a/...1.11/src/test/groovy/AWSClientTest.groovy → ...1.11/src/test/groovy/AWSClientTest.groovy b/...1.11/src/test/groovy/AWSClientTest.groovy → ...1.11/src/test/groovy/AWSClientTest.groovy
diff --git a/...fore_1_11_106/groovy/AWSClientTest.groovy → ...fore_1_11_106/groovy/AWSClientTest.groovy b/...fore_1_11_106/groovy/AWSClientTest.groovy → ...fore_1_11_106/groovy/AWSClientTest.groovy
diff --git a/.../aws-java-sdk-2.2/aws-java-sdk-2.2.gradle → ...umentation/aws-sdk-2.2/aws-sdk-2.2.gradle b/.../aws-java-sdk-2.2/aws-java-sdk-2.2.gradle → ...umentation/aws-sdk-2.2/aws-sdk-2.2.gradle
diff --git a/.../v2/AbstractAwsClientInstrumentation.java → .../v2/AbstractAwsClientInstrumentation.java b/.../v2/AbstractAwsClientInstrumentation.java → .../v2/AbstractAwsClientInstrumentation.java
diff --git a/...tion/aws/v2/AwsClientInstrumentation.java → ...tion/aws/v2/AwsClientInstrumentation.java b/...tion/aws/v2/AwsClientInstrumentation.java → ...tion/aws/v2/AwsClientInstrumentation.java
diff --git a/.../aws/v2/AwsHttpClientInstrumentation.java → .../aws/v2/AwsHttpClientInstrumentation.java b/.../aws/v2/AwsHttpClientInstrumentation.java → .../aws/v2/AwsHttpClientInstrumentation.java
diff --git a/...ntation/aws/v2/AwsSdkClientDecorator.java → ...ntation/aws/v2/AwsSdkClientDecorator.java b/...ntation/aws/v2/AwsSdkClientDecorator.java → ...ntation/aws/v2/AwsSdkClientDecorator.java
@@ -33,7 +33,7 @@ public class AwsSdkClientDecorator extends HttpClientDecorator<SdkHttpRequest, S
   public static final AwsSdkClientDecorator DECORATE = new AwsSdkClientDecorator();
 
   public static final Tracer TRACER =
-      OpenTelemetry.getTracerFactory().get("io.opentelemetry.auto.aws-java-sdk-2.2");
+      OpenTelemetry.getTracerFactory().get("io.opentelemetry.auto.aws-sdk-2.2");
 
   static final String COMPONENT_NAME = "java-aws-sdk";
 

diff --git a/...n/aws/v2/TracingExecutionInterceptor.java → ...n/aws/v2/TracingExecutionInterceptor.java b/...n/aws/v2/TracingExecutionInterceptor.java → ...n/aws/v2/TracingExecutionInterceptor.java
diff --git a/...-2.2/src/test/groovy/AwsClientTest.groovy → ...-2.2/src/test/groovy/AwsClientTest.groovy b/...-2.2/src/test/groovy/AwsClientTest.groovy → ...-2.2/src/test/groovy/AwsClientTest.groovy
diff --git a/...ssandra-3.0/datastax-cassandra-3.0.gradle → ...tation/cassandra-3.0/cassandra-3.0.gradle b/...ssandra-3.0/datastax-cassandra-3.0.gradle → ...tation/cassandra-3.0/cassandra-3.0.gradle
diff --git a/...x/cassandra/CassandraClientDecorator.java → ...x/cassandra/CassandraClientDecorator.java b/...x/cassandra/CassandraClientDecorator.java → ...x/cassandra/CassandraClientDecorator.java
diff --git a/...andra/CassandraClientInstrumentation.java → ...andra/CassandraClientInstrumentation.java b/...andra/CassandraClientInstrumentation.java → ...andra/CassandraClientInstrumentation.java
diff --git a/...on/datastax/cassandra/TracingSession.java → ...on/datastax/cassandra/TracingSession.java b/...on/datastax/cassandra/TracingSession.java → ...on/datastax/cassandra/TracingSession.java
@@ -42,7 +42,7 @@
 
 public class TracingSession implements Session {
   private static final Tracer TRACER =
-      OpenTelemetry.getTracerFactory().get("io.opentelemetry.auto.datastax-cassandra-3.0");
+      OpenTelemetry.getTracerFactory().get("io.opentelemetry.auto.cassandra-3.0");
 
   private final ExecutorService executorService = Executors.newCachedThreadPool();
   private final Session session;

diff --git a/...rc/test/groovy/CassandraClientTest.groovy → ...rc/test/groovy/CassandraClientTest.groovy b/...rc/test/groovy/CassandraClientTest.groovy → ...rc/test/groovy/CassandraClientTest.groovy
diff --git a/instrumentation/cdi-1.2/cdi-1.2.gradle → ...umentation/cdi-testing/cdi-testing.gradle b/instrumentation/cdi-1.2/cdi-1.2.gradle → ...umentation/cdi-testing/cdi-testing.gradle
diff --git a/...2/src/test/groovy/CDIContainerTest.groovy → ...g/src/test/groovy/CDIContainerTest.groovy b/...2/src/test/groovy/CDIContainerTest.groovy → ...g/src/test/groovy/CDIContainerTest.groovy
diff --git a/...ation/cdi-1.2/src/test/java/TestBean.java → ...n/cdi-testing/src/test/java/TestBean.java b/...ation/cdi-1.2/src/test/java/TestBean.java → ...n/cdi-testing/src/test/java/TestBean.java
diff --git a/...entation/classloading/classloading.gradle → ...ava-class-loader/java-class-loader.gradle b/...entation/classloading/classloading.gradle → ...ava-class-loader/java-class-loader.gradle
diff --git a/...oading/jboss-testing/jboss-testing.gradle → ...loader/jboss-testing/jboss-testing.gradle b/...oading/jboss-testing/jboss-testing.gradle → ...loader/jboss-testing/jboss-testing.gradle
@@ -1,7 +1,7 @@
 apply from: "${rootDir}/gradle/java.gradle"
 
 dependencies {
-  testCompile project(':instrumentation:classloading')
+  testCompile project(':instrumentation:java-class-loader')
 
   testCompile group: 'org.jboss.modules', name: 'jboss-modules', version: '1.3.10.Final'
 }
diff --git a/.../test/groovy/JBossClassloadingTest.groovy → .../test/groovy/JBossClassloadingTest.groovy b/.../test/groovy/JBossClassloadingTest.groovy → .../test/groovy/JBossClassloadingTest.groovy
diff --git a/...sloading/osgi-testing/osgi-testing.gradle → ...s-loader/osgi-testing/osgi-testing.gradle b/...sloading/osgi-testing/osgi-testing.gradle → ...s-loader/osgi-testing/osgi-testing.gradle
@@ -1,7 +1,7 @@
 apply from: "${rootDir}/gradle/java.gradle"
 
 dependencies {
-  testCompile project(':instrumentation:classloading')
+  testCompile project(':instrumentation:java-class-loader')
 
   // TODO: we should separate core and Eclipse tests at some point,
   // but right now core-specific tests are quite dump and are run with

diff --git a/...c/test/groovy/OSGIClassloadingTest.groovy → ...c/test/groovy/OSGIClassloadingTest.groovy b/...c/test/groovy/OSGIClassloadingTest.groovy → ...c/test/groovy/OSGIClassloadingTest.groovy
diff --git a/...sloading/ClassloadingInstrumentation.java → ...assloader/ClassLoaderInstrumentation.java b/...sloading/ClassloadingInstrumentation.java → ...assloader/ClassLoaderInstrumentation.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.opentelemetry.auto.instrumentation.classloading;
+package io.opentelemetry.auto.instrumentation.classloader;
 
 import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.extendsClass;
 import static java.util.Collections.singletonMap;
@@ -47,9 +47,9 @@
  * for the classes that we have put in the bootstrap class loader.
  */
 @AutoService(Instrumenter.class)
-public final class ClassloadingInstrumentation extends Instrumenter.Default {
-  public ClassloadingInstrumentation() {
-    super("classloading");
+public final class ClassLoaderInstrumentation extends Instrumenter.Default {
+  public ClassLoaderInstrumentation() {
+    super("class-loader");
   }
 
   @Override
@@ -81,7 +81,7 @@ public Map<? extends ElementMatcher<? super MethodDescription>, String> transfor
                             .and(takesArgument(1, named("boolean")))))
             .and(isPublic().or(isProtected()))
             .and(not(isStatic())),
-        ClassloadingInstrumentation.class.getName() + "$LoadClassAdvice");
+        ClassLoaderInstrumentation.class.getName() + "$LoadClassAdvice");
   }
 
   public static class LoadClassAdvice {

diff --git a/...g/src/test/groovy/ClassloadingTest.groovy → ...r/src/test/groovy/ClassLoadingTest.groovy b/...g/src/test/groovy/ClassloadingTest.groovy → ...r/src/test/groovy/ClassLoadingTest.groovy
@@ -15,7 +15,7 @@
  */
 import io.opentelemetry.auto.test.AgentTestRunner
 
-class ClassloadingTest extends AgentTestRunner {
+class ClassLoadingTest extends AgentTestRunner {
   def "delegates to bootstrap class loader for agent classes"() {
     setup:
     def classLoader = new NonDelegatingURLClassLoader()

diff --git a/...test/groovy/TomcatClassloadingTest.groovy → ...test/groovy/TomcatClassloadingTest.groovy b/...test/groovy/TomcatClassloadingTest.groovy → ...test/groovy/TomcatClassloadingTest.groovy
diff --git a/...ding/tomcat-testing/tomcat-testing.gradle → ...ader/tomcat-testing/tomcat-testing.gradle b/...ding/tomcat-testing/tomcat-testing.gradle → ...ader/tomcat-testing/tomcat-testing.gradle
@@ -18,7 +18,7 @@ testSets {
 }
 
 dependencies {
-  testCompile project(':instrumentation:classloading')
+  testCompile project(':instrumentation:java-class-loader')
 
   //This seems to be the earliest version that has org.apache.catalina.loader.WebappClassLoaderBase
   //Older versions would require slightly different instrumentation.

diff --git a/.../reactor-core-3.1/reactor-core-3.1.gradle → ...umentation/reactor-3.1/reactor-3.1.gradle b/.../reactor-core-3.1/reactor-core-3.1.gradle → ...umentation/reactor-3.1/reactor-3.1.gradle
diff --git a/...ctor/core/FluxAndMonoInstrumentation.java → ...ctor/core/FluxAndMonoInstrumentation.java b/...ctor/core/FluxAndMonoInstrumentation.java → ...ctor/core/FluxAndMonoInstrumentation.java
diff --git a/...ctor/core/FluxAndMonoSubscribeAdvice.java → ...ctor/core/FluxAndMonoSubscribeAdvice.java b/...ctor/core/FluxAndMonoSubscribeAdvice.java → ...ctor/core/FluxAndMonoSubscribeAdvice.java
diff --git a/.../reactor/core/ReactorCoreAdviceUtils.java → .../reactor/core/ReactorCoreAdviceUtils.java b/.../reactor/core/ReactorCoreAdviceUtils.java → .../reactor/core/ReactorCoreAdviceUtils.java
diff --git a/...on/reactor/core/ReactorCoreDecorator.java → ...on/reactor/core/ReactorCoreDecorator.java b/...on/reactor/core/ReactorCoreDecorator.java → ...on/reactor/core/ReactorCoreDecorator.java
@@ -23,7 +23,7 @@
 public class ReactorCoreDecorator extends BaseDecorator {
   public static ReactorCoreDecorator DECORATE = new ReactorCoreDecorator();
   public static final Tracer TRACER =
-      OpenTelemetry.getTracerFactory().get("io.opentelemetry.auto.reactor-core-3.1");
+      OpenTelemetry.getTracerFactory().get("io.opentelemetry.auto.reactor-3.1");
 
   @Override
   protected String getSpanType() {

diff --git a/....1/src/test/groovy/ReactorCoreTest.groovy → ....1/src/test/groovy/ReactorCoreTest.groovy b/....1/src/test/groovy/ReactorCoreTest.groovy → ....1/src/test/groovy/ReactorCoreTest.groovy
diff --git a/instrumentation/servlet/glassfish-testing/src/test/groovy/GlassFishServerTest.groovy b/instrumentation/servlet/glassfish-testing/src/test/groovy/GlassFishServerTest.groovy
@@ -33,7 +33,7 @@ import static io.opentelemetry.trace.Span.Kind.SERVER
 
 /**
  * Unfortunately because we're using an embedded GlassFish instance, we aren't exercising the standard
- * OSGi setup that requires {@link io.opentelemetry.auto.instrumentation.classloading.ClassloadingInstrumentation}.
+ * OSGi setup that requires {@link io.opentelemetry.auto.instrumentation.classloader.ClassloadingInstrumentation}.
  */
 // TODO: Figure out a better way to test with OSGi included.
 class GlassFishServerTest extends HttpServerTest<GlassFish, Servlet3Decorator> {

diff --git a/instrumentation/spring-webflux-5.0/spring-webflux-5.0.gradle b/instrumentation/spring-webflux-5.0/spring-webflux-5.0.gradle
@@ -25,17 +25,17 @@ testSets {
 
 dependencies {
   // We use helpers from this project
-  main_java8CompileOnly project(':instrumentation:reactor-core-3.1')
+  main_java8CompileOnly project(':instrumentation:reactor-3.1')
   main_java8CompileOnly group: 'org.springframework', name: 'spring-webflux', version: '5.0.0.RELEASE'
 
-  // We are using utils class from reactor-core instrumentation.
+  // We are using utils class from reactor instrumentation.
   // TODO: It is unclear why we need to use `compile` here (instead of 'compileOnly')
-  compile project(':instrumentation:reactor-core-3.1')
+  compile project(':instrumentation:reactor-3.1')
 
   testCompile project(':instrumentation:java-concurrent')
   testCompile project(':instrumentation:trace-annotation')
   testCompile project(':instrumentation:netty-4.1')
-  testCompile project(':instrumentation:reactor-core-3.1')
+  testCompile project(':instrumentation:reactor-3.1')
 
   testCompile group: 'org.springframework.boot', name: 'spring-boot-starter-webflux', version: '2.0.0.RELEASE'
   testCompile group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: '2.0.0.RELEASE'

diff --git a/settings.gradle b/settings.gradle
@@ -48,16 +48,12 @@ include ':instrumentation:akka-http-10.0'
 include ':instrumentation:apache-httpasyncclient-4.0'
 include ':instrumentation:apache-httpclient-3.0'
 include ':instrumentation:apache-httpclient-4.0'
-include ':instrumentation:aws-java-sdk-1.11'
-include ':instrumentation:aws-java-sdk-2.2'
-include ':instrumentation:cdi-1.2'
-include ':instrumentation:classloading'
-include ':instrumentation:classloading:jboss-testing'
-include ':instrumentation:classloading:osgi-testing'
-include ':instrumentation:classloading:tomcat-testing'
+include ':instrumentation:aws-sdk-1.11'
+include ':instrumentation:aws-sdk-2.2'
+include ':instrumentation:cassandra-3.0'
+include ':instrumentation:cdi-testing'
 include ':instrumentation:couchbase-2.0'
 include ':instrumentation:couchbase-2.6'
-include ':instrumentation:datastax-cassandra-3.0'
 include ':instrumentation:dropwizard-views-0.7'
 include ':instrumentation:dropwizard-testing'
 include ':instrumentation:elasticsearch'
@@ -77,6 +73,16 @@ include ':instrumentation:hibernate:core-4.0'
 include ':instrumentation:hibernate:core-4.3'
 include ':instrumentation:http-url-connection'
 include ':instrumentation:hystrix-1.4'
+include ':instrumentation:java-class-loader'
+include ':instrumentation:java-class-loader:jboss-testing'
+include ':instrumentation:java-class-loader:osgi-testing'
+include ':instrumentation:java-class-loader:tomcat-testing'
+include ':instrumentation:java-concurrent'
+include ':instrumentation:java-concurrent:kotlin-testing'
+include ':instrumentation:java-concurrent:scala-testing'
+include ':instrumentation:java-concurrent:akka-testing'
+include ':instrumentation:java-concurrent:akka-2.5-testing'
+include ':instrumentation:java-util-logging-events'
 include ':instrumentation:jaxrs-1.0'
 include ':instrumentation:jaxrs-2.0'
 include ':instrumentation:jaxrs-2.0:jaxrs-2.0-jersey-2.0'
@@ -86,12 +92,6 @@ include ':instrumentation:jaxrs-client-1.1'
 include ':instrumentation:jaxrs-client-2.0'
 include ':instrumentation:jaxrs-client-2.0:jaxrs-client-2.0-jersey-2.0'
 include ':instrumentation:jaxrs-client-2.0:jaxrs-client-2.0-resteasy-2.0'
-include ':instrumentation:java-concurrent'
-include ':instrumentation:java-concurrent:kotlin-testing'
-include ':instrumentation:java-concurrent:scala-testing'
-include ':instrumentation:java-concurrent:akka-testing'
-include ':instrumentation:java-concurrent:akka-2.5-testing'
-include ':instrumentation:java-util-logging-events'
 include ':instrumentation:jdbc'
 include ':instrumentation:jedis-1.4'
 include ':instrumentation:jedis-3.0'
@@ -123,7 +123,7 @@ include ':instrumentation:play-ws-2.0'
 include ':instrumentation:play-ws-2.1'
 include ':instrumentation:rabbitmq-amqp-2.7'
 include ':instrumentation:ratpack-1.4'
-include ':instrumentation:reactor-core-3.1'
+include ':instrumentation:reactor-3.1'
 include ':instrumentation:rmi'
 include ':instrumentation:rxjava-1.0'
 include ':instrumentation:servlet'