Rename a few modules (#207)

* Rename classloading module to class-loader

* Rename datastax-cassandra module to cassandra

* Rename reactor-core module to reactor

* Rename cdi module to cdi-testing

* Rename aws-java-sdk module to aws-sdk

* Rename class-loader module to java-class-loader

instrumentation/aws-sdk-1.11/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/TracingRequestHandler.java

@@ -31,7 +31,7 @@ import io.opentelemetry.trace.Tracer;
 /** 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;
 

instrumentation/aws-sdk-2.2/src/main/java8/io/opentelemetry/auto/instrumentation/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";
 

instrumentation/cassandra-3.0/src/main/java/io/opentelemetry/auto/instrumentation/datastax/cassandra/TracingSession.java

@@ -42,7 +42,7 @@ import java.util.concurrent.Executors;
 
 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;

instrumentation/java-class-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'
 }

instrumentation/java-class-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

instrumentation/java-class-loader/src/main/java/io/opentelemetry/auto/instrumentation/classloader/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 @@ import net.bytebuddy.matcher.ElementMatcher;
  * 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 final class ClassloadingInstrumentation extends Instrumenter.Default {
                             .and(takesArgument(1, named("boolean")))))
             .and(isPublic().or(isProtected()))
             .and(not(isStatic())),
-        ClassloadingInstrumentation.class.getName() + "$LoadClassAdvice");
+        ClassLoaderInstrumentation.class.getName() + "$LoadClassAdvice");
   }
 
   public static class LoadClassAdvice {

instrumentation/java-class-loader/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()

instrumentation/java-class-loader/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.

instrumentation/reactor-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/core/ReactorCoreDecorator.java

@@ -23,7 +23,7 @@ import io.opentelemetry.trace.Tracer;
 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() {

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> {

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'

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'