From 299f11140ecaf1fc4a2dffe9524857c05fd800eb Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Tue, 3 Mar 2020 18:57:32 -0800 Subject: [PATCH 1/6] Rename classloading module to class-loader --- .../class-loader.gradle} | 0 .../jboss-testing/jboss-testing.gradle | 2 +- .../src/test/groovy/JBossClassloadingTest.groovy | 0 .../osgi-testing/osgi-testing.gradle | 2 +- .../src/test/groovy/OSGIClassloadingTest.groovy | 0 .../classloader/ClassLoaderInstrumentation.java} | 10 +++++----- .../src/test/groovy/ClassLoadingTest.groovy} | 2 +- .../src/test/groovy/TomcatClassloadingTest.groovy | 0 .../tomcat-testing/tomcat-testing.gradle | 2 +- .../src/test/groovy/GlassFishServerTest.groovy | 2 +- settings.gradle | 8 ++++---- 11 files changed, 14 insertions(+), 14 deletions(-) rename instrumentation/{classloading/classloading.gradle => class-loader/class-loader.gradle} (100%) rename instrumentation/{classloading => class-loader}/jboss-testing/jboss-testing.gradle (73%) rename instrumentation/{classloading => class-loader}/jboss-testing/src/test/groovy/JBossClassloadingTest.groovy (100%) rename instrumentation/{classloading => class-loader}/osgi-testing/osgi-testing.gradle (90%) rename instrumentation/{classloading => class-loader}/osgi-testing/src/test/groovy/OSGIClassloadingTest.groovy (100%) rename instrumentation/{classloading/src/main/java/io/opentelemetry/auto/instrumentation/classloading/ClassloadingInstrumentation.java => class-loader/src/main/java/io/opentelemetry/auto/instrumentation/classloader/ClassLoaderInstrumentation.java} (94%) rename instrumentation/{classloading/src/test/groovy/ClassloadingTest.groovy => class-loader/src/test/groovy/ClassLoadingTest.groovy} (96%) rename instrumentation/{classloading => class-loader}/tomcat-testing/src/test/groovy/TomcatClassloadingTest.groovy (100%) rename instrumentation/{classloading => class-loader}/tomcat-testing/tomcat-testing.gradle (92%) diff --git a/instrumentation/classloading/classloading.gradle b/instrumentation/class-loader/class-loader.gradle similarity index 100% rename from instrumentation/classloading/classloading.gradle rename to instrumentation/class-loader/class-loader.gradle diff --git a/instrumentation/classloading/jboss-testing/jboss-testing.gradle b/instrumentation/class-loader/jboss-testing/jboss-testing.gradle similarity index 73% rename from instrumentation/classloading/jboss-testing/jboss-testing.gradle rename to instrumentation/class-loader/jboss-testing/jboss-testing.gradle index 27478f055513..827649f5e520 100644 --- a/instrumentation/classloading/jboss-testing/jboss-testing.gradle +++ b/instrumentation/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:class-loader') testCompile group: 'org.jboss.modules', name: 'jboss-modules', version: '1.3.10.Final' } diff --git a/instrumentation/classloading/jboss-testing/src/test/groovy/JBossClassloadingTest.groovy b/instrumentation/class-loader/jboss-testing/src/test/groovy/JBossClassloadingTest.groovy similarity index 100% rename from instrumentation/classloading/jboss-testing/src/test/groovy/JBossClassloadingTest.groovy rename to instrumentation/class-loader/jboss-testing/src/test/groovy/JBossClassloadingTest.groovy diff --git a/instrumentation/classloading/osgi-testing/osgi-testing.gradle b/instrumentation/class-loader/osgi-testing/osgi-testing.gradle similarity index 90% rename from instrumentation/classloading/osgi-testing/osgi-testing.gradle rename to instrumentation/class-loader/osgi-testing/osgi-testing.gradle index 2f9491e15be1..db76358143e0 100644 --- a/instrumentation/classloading/osgi-testing/osgi-testing.gradle +++ b/instrumentation/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: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/instrumentation/classloading/osgi-testing/src/test/groovy/OSGIClassloadingTest.groovy b/instrumentation/class-loader/osgi-testing/src/test/groovy/OSGIClassloadingTest.groovy similarity index 100% rename from instrumentation/classloading/osgi-testing/src/test/groovy/OSGIClassloadingTest.groovy rename to instrumentation/class-loader/osgi-testing/src/test/groovy/OSGIClassloadingTest.groovy diff --git a/instrumentation/classloading/src/main/java/io/opentelemetry/auto/instrumentation/classloading/ClassloadingInstrumentation.java b/instrumentation/class-loader/src/main/java/io/opentelemetry/auto/instrumentation/classloader/ClassLoaderInstrumentation.java similarity index 94% rename from instrumentation/classloading/src/main/java/io/opentelemetry/auto/instrumentation/classloading/ClassloadingInstrumentation.java rename to instrumentation/class-loader/src/main/java/io/opentelemetry/auto/instrumentation/classloader/ClassLoaderInstrumentation.java index 4c1ef8f73138..41fcfc2aa4db 100644 --- a/instrumentation/classloading/src/main/java/io/opentelemetry/auto/instrumentation/classloading/ClassloadingInstrumentation.java +++ b/instrumentation/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 @@ * 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, 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/instrumentation/classloading/src/test/groovy/ClassloadingTest.groovy b/instrumentation/class-loader/src/test/groovy/ClassLoadingTest.groovy similarity index 96% rename from instrumentation/classloading/src/test/groovy/ClassloadingTest.groovy rename to instrumentation/class-loader/src/test/groovy/ClassLoadingTest.groovy index 8217e62a425e..6ccc32658068 100644 --- a/instrumentation/classloading/src/test/groovy/ClassloadingTest.groovy +++ b/instrumentation/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() diff --git a/instrumentation/classloading/tomcat-testing/src/test/groovy/TomcatClassloadingTest.groovy b/instrumentation/class-loader/tomcat-testing/src/test/groovy/TomcatClassloadingTest.groovy similarity index 100% rename from instrumentation/classloading/tomcat-testing/src/test/groovy/TomcatClassloadingTest.groovy rename to instrumentation/class-loader/tomcat-testing/src/test/groovy/TomcatClassloadingTest.groovy diff --git a/instrumentation/classloading/tomcat-testing/tomcat-testing.gradle b/instrumentation/class-loader/tomcat-testing/tomcat-testing.gradle similarity index 92% rename from instrumentation/classloading/tomcat-testing/tomcat-testing.gradle rename to instrumentation/class-loader/tomcat-testing/tomcat-testing.gradle index beffdec7a824..4ffb13cea96f 100644 --- a/instrumentation/classloading/tomcat-testing/tomcat-testing.gradle +++ b/instrumentation/class-loader/tomcat-testing/tomcat-testing.gradle @@ -18,7 +18,7 @@ testSets { } dependencies { - testCompile project(':instrumentation:classloading') + testCompile project(':instrumentation: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/instrumentation/servlet/glassfish-testing/src/test/groovy/GlassFishServerTest.groovy b/instrumentation/servlet/glassfish-testing/src/test/groovy/GlassFishServerTest.groovy index 21e076359da5..522d486d860c 100644 --- 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 { diff --git a/settings.gradle b/settings.gradle index 900de37ff2cb..e7d30fad1f98 100644 --- a/settings.gradle +++ b/settings.gradle @@ -51,10 +51,10 @@ 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:class-loader' +include ':instrumentation:class-loader:jboss-testing' +include ':instrumentation:class-loader:osgi-testing' +include ':instrumentation:class-loader:tomcat-testing' include ':instrumentation:couchbase-2.0' include ':instrumentation:couchbase-2.6' include ':instrumentation:datastax-cassandra-3.0' From 52f818cc9160db3be79effca9d20fc584108ead7 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Tue, 3 Mar 2020 20:26:23 -0800 Subject: [PATCH 2/6] Rename datastax-cassandra module to cassandra --- .../cassandra-3.0.gradle} | 0 .../datastax/cassandra/CassandraClientDecorator.java | 0 .../datastax/cassandra/CassandraClientInstrumentation.java | 0 .../auto/instrumentation/datastax/cassandra/TracingSession.java | 2 +- .../src/test/groovy/CassandraClientTest.groovy | 0 settings.gradle | 2 +- 6 files changed, 2 insertions(+), 2 deletions(-) rename instrumentation/{datastax-cassandra-3.0/datastax-cassandra-3.0.gradle => cassandra-3.0/cassandra-3.0.gradle} (100%) rename instrumentation/{datastax-cassandra-3.0 => cassandra-3.0}/src/main/java/io/opentelemetry/auto/instrumentation/datastax/cassandra/CassandraClientDecorator.java (100%) rename instrumentation/{datastax-cassandra-3.0 => cassandra-3.0}/src/main/java/io/opentelemetry/auto/instrumentation/datastax/cassandra/CassandraClientInstrumentation.java (100%) rename instrumentation/{datastax-cassandra-3.0 => cassandra-3.0}/src/main/java/io/opentelemetry/auto/instrumentation/datastax/cassandra/TracingSession.java (99%) rename instrumentation/{datastax-cassandra-3.0 => cassandra-3.0}/src/test/groovy/CassandraClientTest.groovy (100%) diff --git a/instrumentation/datastax-cassandra-3.0/datastax-cassandra-3.0.gradle b/instrumentation/cassandra-3.0/cassandra-3.0.gradle similarity index 100% rename from instrumentation/datastax-cassandra-3.0/datastax-cassandra-3.0.gradle rename to instrumentation/cassandra-3.0/cassandra-3.0.gradle diff --git a/instrumentation/datastax-cassandra-3.0/src/main/java/io/opentelemetry/auto/instrumentation/datastax/cassandra/CassandraClientDecorator.java b/instrumentation/cassandra-3.0/src/main/java/io/opentelemetry/auto/instrumentation/datastax/cassandra/CassandraClientDecorator.java similarity index 100% rename from instrumentation/datastax-cassandra-3.0/src/main/java/io/opentelemetry/auto/instrumentation/datastax/cassandra/CassandraClientDecorator.java rename to instrumentation/cassandra-3.0/src/main/java/io/opentelemetry/auto/instrumentation/datastax/cassandra/CassandraClientDecorator.java diff --git a/instrumentation/datastax-cassandra-3.0/src/main/java/io/opentelemetry/auto/instrumentation/datastax/cassandra/CassandraClientInstrumentation.java b/instrumentation/cassandra-3.0/src/main/java/io/opentelemetry/auto/instrumentation/datastax/cassandra/CassandraClientInstrumentation.java similarity index 100% rename from instrumentation/datastax-cassandra-3.0/src/main/java/io/opentelemetry/auto/instrumentation/datastax/cassandra/CassandraClientInstrumentation.java rename to instrumentation/cassandra-3.0/src/main/java/io/opentelemetry/auto/instrumentation/datastax/cassandra/CassandraClientInstrumentation.java diff --git a/instrumentation/datastax-cassandra-3.0/src/main/java/io/opentelemetry/auto/instrumentation/datastax/cassandra/TracingSession.java b/instrumentation/cassandra-3.0/src/main/java/io/opentelemetry/auto/instrumentation/datastax/cassandra/TracingSession.java similarity index 99% rename from instrumentation/datastax-cassandra-3.0/src/main/java/io/opentelemetry/auto/instrumentation/datastax/cassandra/TracingSession.java rename to instrumentation/cassandra-3.0/src/main/java/io/opentelemetry/auto/instrumentation/datastax/cassandra/TracingSession.java index 9fd870925d10..2d296f474f0d 100644 --- a/instrumentation/datastax-cassandra-3.0/src/main/java/io/opentelemetry/auto/instrumentation/datastax/cassandra/TracingSession.java +++ b/instrumentation/cassandra-3.0/src/main/java/io/opentelemetry/auto/instrumentation/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/instrumentation/datastax-cassandra-3.0/src/test/groovy/CassandraClientTest.groovy b/instrumentation/cassandra-3.0/src/test/groovy/CassandraClientTest.groovy similarity index 100% rename from instrumentation/datastax-cassandra-3.0/src/test/groovy/CassandraClientTest.groovy rename to instrumentation/cassandra-3.0/src/test/groovy/CassandraClientTest.groovy diff --git a/settings.gradle b/settings.gradle index e7d30fad1f98..d6f2b5da26d3 100644 --- a/settings.gradle +++ b/settings.gradle @@ -50,6 +50,7 @@ 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:cassandra-3.0' include ':instrumentation:cdi-1.2' include ':instrumentation:class-loader' include ':instrumentation:class-loader:jboss-testing' @@ -57,7 +58,6 @@ include ':instrumentation:class-loader:osgi-testing' include ':instrumentation:class-loader:tomcat-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' From 38d8ea2aa70e57afcceb9a8b9728816254fd6cdc Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Tue, 3 Mar 2020 20:29:07 -0800 Subject: [PATCH 3/6] Rename reactor-core module to reactor --- .../reactor-3.1.gradle} | 0 .../reactor/core/FluxAndMonoInstrumentation.java | 0 .../reactor/core/FluxAndMonoSubscribeAdvice.java | 0 .../reactor/core/ReactorCoreAdviceUtils.java | 0 .../reactor/core/ReactorCoreDecorator.java | 2 +- .../src/test/groovy/ReactorCoreTest.groovy | 0 .../spring-webflux-5.0/spring-webflux-5.0.gradle | 8 ++++---- settings.gradle | 2 +- 8 files changed, 6 insertions(+), 6 deletions(-) rename instrumentation/{reactor-core-3.1/reactor-core-3.1.gradle => reactor-3.1/reactor-3.1.gradle} (100%) rename instrumentation/{reactor-core-3.1 => reactor-3.1}/src/main/java/io/opentelemetry/auto/instrumentation/reactor/core/FluxAndMonoInstrumentation.java (100%) rename instrumentation/{reactor-core-3.1 => reactor-3.1}/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/core/FluxAndMonoSubscribeAdvice.java (100%) rename instrumentation/{reactor-core-3.1 => reactor-3.1}/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/core/ReactorCoreAdviceUtils.java (100%) rename instrumentation/{reactor-core-3.1 => reactor-3.1}/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/core/ReactorCoreDecorator.java (98%) rename instrumentation/{reactor-core-3.1 => reactor-3.1}/src/test/groovy/ReactorCoreTest.groovy (100%) diff --git a/instrumentation/reactor-core-3.1/reactor-core-3.1.gradle b/instrumentation/reactor-3.1/reactor-3.1.gradle similarity index 100% rename from instrumentation/reactor-core-3.1/reactor-core-3.1.gradle rename to instrumentation/reactor-3.1/reactor-3.1.gradle diff --git a/instrumentation/reactor-core-3.1/src/main/java/io/opentelemetry/auto/instrumentation/reactor/core/FluxAndMonoInstrumentation.java b/instrumentation/reactor-3.1/src/main/java/io/opentelemetry/auto/instrumentation/reactor/core/FluxAndMonoInstrumentation.java similarity index 100% rename from instrumentation/reactor-core-3.1/src/main/java/io/opentelemetry/auto/instrumentation/reactor/core/FluxAndMonoInstrumentation.java rename to instrumentation/reactor-3.1/src/main/java/io/opentelemetry/auto/instrumentation/reactor/core/FluxAndMonoInstrumentation.java diff --git a/instrumentation/reactor-core-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/core/FluxAndMonoSubscribeAdvice.java b/instrumentation/reactor-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/core/FluxAndMonoSubscribeAdvice.java similarity index 100% rename from instrumentation/reactor-core-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/core/FluxAndMonoSubscribeAdvice.java rename to instrumentation/reactor-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/core/FluxAndMonoSubscribeAdvice.java diff --git a/instrumentation/reactor-core-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/core/ReactorCoreAdviceUtils.java b/instrumentation/reactor-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/core/ReactorCoreAdviceUtils.java similarity index 100% rename from instrumentation/reactor-core-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/core/ReactorCoreAdviceUtils.java rename to instrumentation/reactor-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/core/ReactorCoreAdviceUtils.java diff --git a/instrumentation/reactor-core-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/core/ReactorCoreDecorator.java b/instrumentation/reactor-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/core/ReactorCoreDecorator.java similarity index 98% rename from instrumentation/reactor-core-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/core/ReactorCoreDecorator.java rename to instrumentation/reactor-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/core/ReactorCoreDecorator.java index e8c089b1f267..68b13dc8d306 100644 --- a/instrumentation/reactor-core-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/core/ReactorCoreDecorator.java +++ b/instrumentation/reactor-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/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/instrumentation/reactor-core-3.1/src/test/groovy/ReactorCoreTest.groovy b/instrumentation/reactor-3.1/src/test/groovy/ReactorCoreTest.groovy similarity index 100% rename from instrumentation/reactor-core-3.1/src/test/groovy/ReactorCoreTest.groovy rename to instrumentation/reactor-3.1/src/test/groovy/ReactorCoreTest.groovy diff --git a/instrumentation/spring-webflux-5.0/spring-webflux-5.0.gradle b/instrumentation/spring-webflux-5.0/spring-webflux-5.0.gradle index cb521126b0d8..e0323564efde 100644 --- 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 index d6f2b5da26d3..bcbbe94a453d 100644 --- a/settings.gradle +++ b/settings.gradle @@ -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' From ecdd57a042087baed8ac0814578bc2e0f398a220 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Tue, 3 Mar 2020 20:30:41 -0800 Subject: [PATCH 4/6] Rename cdi module to cdi-testing --- .../{cdi-1.2/cdi-1.2.gradle => cdi-testing/cdi-testing.gradle} | 0 .../src/test/groovy/CDIContainerTest.groovy | 0 .../{cdi-1.2 => cdi-testing}/src/test/java/TestBean.java | 0 settings.gradle | 2 +- 4 files changed, 1 insertion(+), 1 deletion(-) rename instrumentation/{cdi-1.2/cdi-1.2.gradle => cdi-testing/cdi-testing.gradle} (100%) rename instrumentation/{cdi-1.2 => cdi-testing}/src/test/groovy/CDIContainerTest.groovy (100%) rename instrumentation/{cdi-1.2 => cdi-testing}/src/test/java/TestBean.java (100%) diff --git a/instrumentation/cdi-1.2/cdi-1.2.gradle b/instrumentation/cdi-testing/cdi-testing.gradle similarity index 100% rename from instrumentation/cdi-1.2/cdi-1.2.gradle rename to instrumentation/cdi-testing/cdi-testing.gradle diff --git a/instrumentation/cdi-1.2/src/test/groovy/CDIContainerTest.groovy b/instrumentation/cdi-testing/src/test/groovy/CDIContainerTest.groovy similarity index 100% rename from instrumentation/cdi-1.2/src/test/groovy/CDIContainerTest.groovy rename to instrumentation/cdi-testing/src/test/groovy/CDIContainerTest.groovy diff --git a/instrumentation/cdi-1.2/src/test/java/TestBean.java b/instrumentation/cdi-testing/src/test/java/TestBean.java similarity index 100% rename from instrumentation/cdi-1.2/src/test/java/TestBean.java rename to instrumentation/cdi-testing/src/test/java/TestBean.java diff --git a/settings.gradle b/settings.gradle index bcbbe94a453d..bfbb4cb83060 100644 --- a/settings.gradle +++ b/settings.gradle @@ -51,7 +51,7 @@ include ':instrumentation:apache-httpclient-4.0' include ':instrumentation:aws-java-sdk-1.11' include ':instrumentation:aws-java-sdk-2.2' include ':instrumentation:cassandra-3.0' -include ':instrumentation:cdi-1.2' +include ':instrumentation:cdi-testing' include ':instrumentation:class-loader' include ':instrumentation:class-loader:jboss-testing' include ':instrumentation:class-loader:osgi-testing' From c922bb1564d5b574598385bc155890775f84947c Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Tue, 3 Mar 2020 20:44:38 -0800 Subject: [PATCH 5/6] Rename aws-java-sdk module to aws-sdk --- .../aws-sdk-1.11.gradle} | 0 .../auto/instrumentation/aws/v0/AWSClientInstrumentation.java | 0 .../instrumentation/aws/v0/AWSHttpClientInstrumentation.java | 0 .../auto/instrumentation/aws/v0/AwsSdkClientDecorator.java | 0 .../auto/instrumentation/aws/v0/OnErrorDecorator.java | 0 .../auto/instrumentation/aws/v0/RequestInstrumentation.java | 0 .../auto/instrumentation/aws/v0/RequestMeta.java | 0 .../auto/instrumentation/aws/v0/TracingRequestHandler.java | 2 +- .../src/test/groovy/AWSClientTest.groovy | 0 .../src/test_before_1_11_106/groovy/AWSClientTest.groovy | 0 .../aws-sdk-2.2.gradle} | 0 .../aws/v2/AbstractAwsClientInstrumentation.java | 0 .../auto/instrumentation/aws/v2/AwsClientInstrumentation.java | 0 .../instrumentation/aws/v2/AwsHttpClientInstrumentation.java | 0 .../auto/instrumentation/aws/v2/AwsSdkClientDecorator.java | 2 +- .../instrumentation/aws/v2/TracingExecutionInterceptor.java | 0 .../src/test/groovy/AwsClientTest.groovy | 0 settings.gradle | 4 ++-- 18 files changed, 4 insertions(+), 4 deletions(-) rename instrumentation/{aws-java-sdk-1.11/aws-java-sdk-1.11.gradle => aws-sdk-1.11/aws-sdk-1.11.gradle} (100%) rename instrumentation/{aws-java-sdk-1.11 => aws-sdk-1.11}/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/AWSClientInstrumentation.java (100%) rename instrumentation/{aws-java-sdk-1.11 => aws-sdk-1.11}/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/AWSHttpClientInstrumentation.java (100%) rename instrumentation/{aws-java-sdk-1.11 => aws-sdk-1.11}/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/AwsSdkClientDecorator.java (100%) rename instrumentation/{aws-java-sdk-1.11 => aws-sdk-1.11}/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/OnErrorDecorator.java (100%) rename instrumentation/{aws-java-sdk-1.11 => aws-sdk-1.11}/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/RequestInstrumentation.java (100%) rename instrumentation/{aws-java-sdk-1.11 => aws-sdk-1.11}/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/RequestMeta.java (100%) rename instrumentation/{aws-java-sdk-1.11 => aws-sdk-1.11}/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/TracingRequestHandler.java (99%) rename instrumentation/{aws-java-sdk-1.11 => aws-sdk-1.11}/src/test/groovy/AWSClientTest.groovy (100%) rename instrumentation/{aws-java-sdk-1.11 => aws-sdk-1.11}/src/test_before_1_11_106/groovy/AWSClientTest.groovy (100%) rename instrumentation/{aws-java-sdk-2.2/aws-java-sdk-2.2.gradle => aws-sdk-2.2/aws-sdk-2.2.gradle} (100%) rename instrumentation/{aws-java-sdk-2.2 => aws-sdk-2.2}/src/main/java/io/opentelemetry/auto/instrumentation/aws/v2/AbstractAwsClientInstrumentation.java (100%) rename instrumentation/{aws-java-sdk-2.2 => aws-sdk-2.2}/src/main/java/io/opentelemetry/auto/instrumentation/aws/v2/AwsClientInstrumentation.java (100%) rename instrumentation/{aws-java-sdk-2.2 => aws-sdk-2.2}/src/main/java/io/opentelemetry/auto/instrumentation/aws/v2/AwsHttpClientInstrumentation.java (100%) rename instrumentation/{aws-java-sdk-2.2 => aws-sdk-2.2}/src/main/java8/io/opentelemetry/auto/instrumentation/aws/v2/AwsSdkClientDecorator.java (99%) rename instrumentation/{aws-java-sdk-2.2 => aws-sdk-2.2}/src/main/java8/io/opentelemetry/auto/instrumentation/aws/v2/TracingExecutionInterceptor.java (100%) rename instrumentation/{aws-java-sdk-2.2 => aws-sdk-2.2}/src/test/groovy/AwsClientTest.groovy (100%) diff --git a/instrumentation/aws-java-sdk-1.11/aws-java-sdk-1.11.gradle b/instrumentation/aws-sdk-1.11/aws-sdk-1.11.gradle similarity index 100% rename from instrumentation/aws-java-sdk-1.11/aws-java-sdk-1.11.gradle rename to instrumentation/aws-sdk-1.11/aws-sdk-1.11.gradle diff --git a/instrumentation/aws-java-sdk-1.11/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/AWSClientInstrumentation.java b/instrumentation/aws-sdk-1.11/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/AWSClientInstrumentation.java similarity index 100% rename from instrumentation/aws-java-sdk-1.11/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/AWSClientInstrumentation.java rename to instrumentation/aws-sdk-1.11/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/AWSClientInstrumentation.java diff --git a/instrumentation/aws-java-sdk-1.11/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/AWSHttpClientInstrumentation.java b/instrumentation/aws-sdk-1.11/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/AWSHttpClientInstrumentation.java similarity index 100% rename from instrumentation/aws-java-sdk-1.11/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/AWSHttpClientInstrumentation.java rename to instrumentation/aws-sdk-1.11/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/AWSHttpClientInstrumentation.java diff --git a/instrumentation/aws-java-sdk-1.11/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/AwsSdkClientDecorator.java b/instrumentation/aws-sdk-1.11/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/AwsSdkClientDecorator.java similarity index 100% rename from instrumentation/aws-java-sdk-1.11/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/AwsSdkClientDecorator.java rename to instrumentation/aws-sdk-1.11/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/AwsSdkClientDecorator.java diff --git a/instrumentation/aws-java-sdk-1.11/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/OnErrorDecorator.java b/instrumentation/aws-sdk-1.11/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/OnErrorDecorator.java similarity index 100% rename from instrumentation/aws-java-sdk-1.11/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/OnErrorDecorator.java rename to instrumentation/aws-sdk-1.11/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/OnErrorDecorator.java diff --git a/instrumentation/aws-java-sdk-1.11/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/RequestInstrumentation.java b/instrumentation/aws-sdk-1.11/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/RequestInstrumentation.java similarity index 100% rename from instrumentation/aws-java-sdk-1.11/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/RequestInstrumentation.java rename to instrumentation/aws-sdk-1.11/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/RequestInstrumentation.java diff --git a/instrumentation/aws-java-sdk-1.11/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/RequestMeta.java b/instrumentation/aws-sdk-1.11/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/RequestMeta.java similarity index 100% rename from instrumentation/aws-java-sdk-1.11/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/RequestMeta.java rename to instrumentation/aws-sdk-1.11/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/RequestMeta.java diff --git a/instrumentation/aws-java-sdk-1.11/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/TracingRequestHandler.java b/instrumentation/aws-sdk-1.11/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/TracingRequestHandler.java similarity index 99% rename from instrumentation/aws-java-sdk-1.11/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/TracingRequestHandler.java rename to instrumentation/aws-sdk-1.11/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/TracingRequestHandler.java index 9054c17ce96f..aa0a542fd33e 100644 --- a/instrumentation/aws-java-sdk-1.11/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/TracingRequestHandler.java +++ b/instrumentation/aws-sdk-1.11/src/main/java/io/opentelemetry/auto/instrumentation/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/instrumentation/aws-java-sdk-1.11/src/test/groovy/AWSClientTest.groovy b/instrumentation/aws-sdk-1.11/src/test/groovy/AWSClientTest.groovy similarity index 100% rename from instrumentation/aws-java-sdk-1.11/src/test/groovy/AWSClientTest.groovy rename to instrumentation/aws-sdk-1.11/src/test/groovy/AWSClientTest.groovy diff --git a/instrumentation/aws-java-sdk-1.11/src/test_before_1_11_106/groovy/AWSClientTest.groovy b/instrumentation/aws-sdk-1.11/src/test_before_1_11_106/groovy/AWSClientTest.groovy similarity index 100% rename from instrumentation/aws-java-sdk-1.11/src/test_before_1_11_106/groovy/AWSClientTest.groovy rename to instrumentation/aws-sdk-1.11/src/test_before_1_11_106/groovy/AWSClientTest.groovy diff --git a/instrumentation/aws-java-sdk-2.2/aws-java-sdk-2.2.gradle b/instrumentation/aws-sdk-2.2/aws-sdk-2.2.gradle similarity index 100% rename from instrumentation/aws-java-sdk-2.2/aws-java-sdk-2.2.gradle rename to instrumentation/aws-sdk-2.2/aws-sdk-2.2.gradle diff --git a/instrumentation/aws-java-sdk-2.2/src/main/java/io/opentelemetry/auto/instrumentation/aws/v2/AbstractAwsClientInstrumentation.java b/instrumentation/aws-sdk-2.2/src/main/java/io/opentelemetry/auto/instrumentation/aws/v2/AbstractAwsClientInstrumentation.java similarity index 100% rename from instrumentation/aws-java-sdk-2.2/src/main/java/io/opentelemetry/auto/instrumentation/aws/v2/AbstractAwsClientInstrumentation.java rename to instrumentation/aws-sdk-2.2/src/main/java/io/opentelemetry/auto/instrumentation/aws/v2/AbstractAwsClientInstrumentation.java diff --git a/instrumentation/aws-java-sdk-2.2/src/main/java/io/opentelemetry/auto/instrumentation/aws/v2/AwsClientInstrumentation.java b/instrumentation/aws-sdk-2.2/src/main/java/io/opentelemetry/auto/instrumentation/aws/v2/AwsClientInstrumentation.java similarity index 100% rename from instrumentation/aws-java-sdk-2.2/src/main/java/io/opentelemetry/auto/instrumentation/aws/v2/AwsClientInstrumentation.java rename to instrumentation/aws-sdk-2.2/src/main/java/io/opentelemetry/auto/instrumentation/aws/v2/AwsClientInstrumentation.java diff --git a/instrumentation/aws-java-sdk-2.2/src/main/java/io/opentelemetry/auto/instrumentation/aws/v2/AwsHttpClientInstrumentation.java b/instrumentation/aws-sdk-2.2/src/main/java/io/opentelemetry/auto/instrumentation/aws/v2/AwsHttpClientInstrumentation.java similarity index 100% rename from instrumentation/aws-java-sdk-2.2/src/main/java/io/opentelemetry/auto/instrumentation/aws/v2/AwsHttpClientInstrumentation.java rename to instrumentation/aws-sdk-2.2/src/main/java/io/opentelemetry/auto/instrumentation/aws/v2/AwsHttpClientInstrumentation.java diff --git a/instrumentation/aws-java-sdk-2.2/src/main/java8/io/opentelemetry/auto/instrumentation/aws/v2/AwsSdkClientDecorator.java b/instrumentation/aws-sdk-2.2/src/main/java8/io/opentelemetry/auto/instrumentation/aws/v2/AwsSdkClientDecorator.java similarity index 99% rename from instrumentation/aws-java-sdk-2.2/src/main/java8/io/opentelemetry/auto/instrumentation/aws/v2/AwsSdkClientDecorator.java rename to instrumentation/aws-sdk-2.2/src/main/java8/io/opentelemetry/auto/instrumentation/aws/v2/AwsSdkClientDecorator.java index ce490b936fba..6f3aa0dc6e08 100644 --- a/instrumentation/aws-java-sdk-2.2/src/main/java8/io/opentelemetry/auto/instrumentation/aws/v2/AwsSdkClientDecorator.java +++ b/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 Date: Thu, 5 Mar 2020 20:02:09 -0800 Subject: [PATCH 6/6] Rename class-loader module to java-class-loader --- .../java-class-loader.gradle} | 0 .../jboss-testing/jboss-testing.gradle | 2 +- .../test/groovy/JBossClassloadingTest.groovy | 0 .../osgi-testing/osgi-testing.gradle | 2 +- .../test/groovy/OSGIClassloadingTest.groovy | 0 .../ClassLoaderInstrumentation.java | 0 .../src/test/groovy/ClassLoadingTest.groovy | 0 .../test/groovy/TomcatClassloadingTest.groovy | 0 .../tomcat-testing/tomcat-testing.gradle | 2 +- settings.gradle | 20 +++++++++---------- 10 files changed, 13 insertions(+), 13 deletions(-) rename instrumentation/{class-loader/class-loader.gradle => java-class-loader/java-class-loader.gradle} (100%) rename instrumentation/{class-loader => java-class-loader}/jboss-testing/jboss-testing.gradle (71%) rename instrumentation/{class-loader => java-class-loader}/jboss-testing/src/test/groovy/JBossClassloadingTest.groovy (100%) rename instrumentation/{class-loader => java-class-loader}/osgi-testing/osgi-testing.gradle (89%) rename instrumentation/{class-loader => java-class-loader}/osgi-testing/src/test/groovy/OSGIClassloadingTest.groovy (100%) rename instrumentation/{class-loader => java-class-loader}/src/main/java/io/opentelemetry/auto/instrumentation/classloader/ClassLoaderInstrumentation.java (100%) rename instrumentation/{class-loader => java-class-loader}/src/test/groovy/ClassLoadingTest.groovy (100%) rename instrumentation/{class-loader => java-class-loader}/tomcat-testing/src/test/groovy/TomcatClassloadingTest.groovy (100%) rename instrumentation/{class-loader => java-class-loader}/tomcat-testing/tomcat-testing.gradle (91%) diff --git a/instrumentation/class-loader/class-loader.gradle b/instrumentation/java-class-loader/java-class-loader.gradle similarity index 100% rename from instrumentation/class-loader/class-loader.gradle rename to instrumentation/java-class-loader/java-class-loader.gradle diff --git a/instrumentation/class-loader/jboss-testing/jboss-testing.gradle b/instrumentation/java-class-loader/jboss-testing/jboss-testing.gradle similarity index 71% rename from instrumentation/class-loader/jboss-testing/jboss-testing.gradle rename to instrumentation/java-class-loader/jboss-testing/jboss-testing.gradle index 827649f5e520..0efde0f4d85d 100644 --- a/instrumentation/class-loader/jboss-testing/jboss-testing.gradle +++ b/instrumentation/java-class-loader/jboss-testing/jboss-testing.gradle @@ -1,7 +1,7 @@ apply from: "${rootDir}/gradle/java.gradle" dependencies { - testCompile project(':instrumentation:class-loader') + testCompile project(':instrumentation:java-class-loader') testCompile group: 'org.jboss.modules', name: 'jboss-modules', version: '1.3.10.Final' } diff --git a/instrumentation/class-loader/jboss-testing/src/test/groovy/JBossClassloadingTest.groovy b/instrumentation/java-class-loader/jboss-testing/src/test/groovy/JBossClassloadingTest.groovy similarity index 100% rename from instrumentation/class-loader/jboss-testing/src/test/groovy/JBossClassloadingTest.groovy rename to instrumentation/java-class-loader/jboss-testing/src/test/groovy/JBossClassloadingTest.groovy diff --git a/instrumentation/class-loader/osgi-testing/osgi-testing.gradle b/instrumentation/java-class-loader/osgi-testing/osgi-testing.gradle similarity index 89% rename from instrumentation/class-loader/osgi-testing/osgi-testing.gradle rename to instrumentation/java-class-loader/osgi-testing/osgi-testing.gradle index db76358143e0..1c3d8a8aed66 100644 --- a/instrumentation/class-loader/osgi-testing/osgi-testing.gradle +++ b/instrumentation/java-class-loader/osgi-testing/osgi-testing.gradle @@ -1,7 +1,7 @@ apply from: "${rootDir}/gradle/java.gradle" dependencies { - testCompile project(':instrumentation:class-loader') + 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/instrumentation/class-loader/osgi-testing/src/test/groovy/OSGIClassloadingTest.groovy b/instrumentation/java-class-loader/osgi-testing/src/test/groovy/OSGIClassloadingTest.groovy similarity index 100% rename from instrumentation/class-loader/osgi-testing/src/test/groovy/OSGIClassloadingTest.groovy rename to instrumentation/java-class-loader/osgi-testing/src/test/groovy/OSGIClassloadingTest.groovy diff --git a/instrumentation/class-loader/src/main/java/io/opentelemetry/auto/instrumentation/classloader/ClassLoaderInstrumentation.java b/instrumentation/java-class-loader/src/main/java/io/opentelemetry/auto/instrumentation/classloader/ClassLoaderInstrumentation.java similarity index 100% rename from instrumentation/class-loader/src/main/java/io/opentelemetry/auto/instrumentation/classloader/ClassLoaderInstrumentation.java rename to instrumentation/java-class-loader/src/main/java/io/opentelemetry/auto/instrumentation/classloader/ClassLoaderInstrumentation.java diff --git a/instrumentation/class-loader/src/test/groovy/ClassLoadingTest.groovy b/instrumentation/java-class-loader/src/test/groovy/ClassLoadingTest.groovy similarity index 100% rename from instrumentation/class-loader/src/test/groovy/ClassLoadingTest.groovy rename to instrumentation/java-class-loader/src/test/groovy/ClassLoadingTest.groovy diff --git a/instrumentation/class-loader/tomcat-testing/src/test/groovy/TomcatClassloadingTest.groovy b/instrumentation/java-class-loader/tomcat-testing/src/test/groovy/TomcatClassloadingTest.groovy similarity index 100% rename from instrumentation/class-loader/tomcat-testing/src/test/groovy/TomcatClassloadingTest.groovy rename to instrumentation/java-class-loader/tomcat-testing/src/test/groovy/TomcatClassloadingTest.groovy diff --git a/instrumentation/class-loader/tomcat-testing/tomcat-testing.gradle b/instrumentation/java-class-loader/tomcat-testing/tomcat-testing.gradle similarity index 91% rename from instrumentation/class-loader/tomcat-testing/tomcat-testing.gradle rename to instrumentation/java-class-loader/tomcat-testing/tomcat-testing.gradle index 4ffb13cea96f..b73c3413a71d 100644 --- a/instrumentation/class-loader/tomcat-testing/tomcat-testing.gradle +++ b/instrumentation/java-class-loader/tomcat-testing/tomcat-testing.gradle @@ -18,7 +18,7 @@ testSets { } dependencies { - testCompile project(':instrumentation:class-loader') + 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/settings.gradle b/settings.gradle index c5457e7bcabe..40ab6d1316a0 100644 --- a/settings.gradle +++ b/settings.gradle @@ -52,10 +52,6 @@ include ':instrumentation:aws-sdk-1.11' include ':instrumentation:aws-sdk-2.2' include ':instrumentation:cassandra-3.0' include ':instrumentation:cdi-testing' -include ':instrumentation:class-loader' -include ':instrumentation:class-loader:jboss-testing' -include ':instrumentation:class-loader:osgi-testing' -include ':instrumentation:class-loader:tomcat-testing' include ':instrumentation:couchbase-2.0' include ':instrumentation:couchbase-2.6' include ':instrumentation:dropwizard-views-0.7' @@ -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'