diff --git a/docs/contributing/writing-instrumentation-module.md b/docs/contributing/writing-instrumentation-module.md index 3926be0d5db4..6153de3e454c 100644 --- a/docs/contributing/writing-instrumentation-module.md +++ b/docs/contributing/writing-instrumentation-module.md @@ -420,12 +420,13 @@ to `true` and make it non-experimental. ### Shared classes and common classloader -By default, all the advices of an instrumentation module will be loaded into isolated classloaders, -one per instrumentation module. Some instrumentations require to use a common classloader in order -to preserve the semantics of `static` fields and to share classes. +All the advices are loaded into a shared classloader: -In order to load multiple `InstrumentationModule` implementations in the same classloader, you need to -override the `ExperimentalInstrumentationModule#getModuleGroup` to return an identical value. +- one common classloader for internal instrumentation modules +- one common classloader per extension + +This allows to share classes between internal instrumentation modules, however each extension is isolated from others and from the internal instrumentation modules. +This means that extensions should not depend on internal instrumentation modules or rely on classes to be shared between them. ### Classes injected in application classloader diff --git a/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/v10_0/server/AkkaHttpServerInstrumentationModule.java b/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/v10_0/server/AkkaHttpServerInstrumentationModule.java index 4773e687a369..94331a42e3bc 100644 --- a/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/v10_0/server/AkkaHttpServerInstrumentationModule.java +++ b/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/v10_0/server/AkkaHttpServerInstrumentationModule.java @@ -11,22 +11,15 @@ import com.google.auto.service.AutoService; import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; -import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule; import java.util.List; import net.bytebuddy.matcher.ElementMatcher; @AutoService(InstrumentationModule.class) -public class AkkaHttpServerInstrumentationModule extends InstrumentationModule - implements ExperimentalInstrumentationModule { +public class AkkaHttpServerInstrumentationModule extends InstrumentationModule { public AkkaHttpServerInstrumentationModule() { super("akka-http", "akka-http-10.0", "akka-http-server"); } - @Override - public String getModuleGroup() { - return "akka-http"; - } - @Override public ElementMatcher.Junction classLoaderMatcher() { // in GraphInterpreterInstrumentation we instrument a class that belongs to akka-streams, make diff --git a/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/v10_0/server/route/AkkaHttpServerRouteInstrumentationModule.java b/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/v10_0/server/route/AkkaHttpServerRouteInstrumentationModule.java index 72de95f90253..c7274bf79606 100644 --- a/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/v10_0/server/route/AkkaHttpServerRouteInstrumentationModule.java +++ b/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/v10_0/server/route/AkkaHttpServerRouteInstrumentationModule.java @@ -10,7 +10,6 @@ import com.google.auto.service.AutoService; import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; -import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule; import java.util.List; /** @@ -18,17 +17,11 @@ * AkkaHttpServerInstrumentationModule applies to classes in akka-http-core.jar */ @AutoService(InstrumentationModule.class) -public class AkkaHttpServerRouteInstrumentationModule extends InstrumentationModule - implements ExperimentalInstrumentationModule { +public class AkkaHttpServerRouteInstrumentationModule extends InstrumentationModule { public AkkaHttpServerRouteInstrumentationModule() { super("akka-http", "akka-http-10.0", "akka-http-server", "akka-http-server-route"); } - @Override - public String getModuleGroup() { - return "akka-http"; - } - @Override public List typeInstrumentations() { return asList( diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/AbstractAwsSdkInstrumentationModule.java b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/AbstractAwsSdkInstrumentationModule.java index c8aa58a1cfd6..62d7913909e0 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/AbstractAwsSdkInstrumentationModule.java +++ b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/AbstractAwsSdkInstrumentationModule.java @@ -12,14 +12,12 @@ import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer; -import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule; import java.util.List; import net.bytebuddy.description.type.TypeDescription; import net.bytebuddy.matcher.ElementMatcher; // TODO: Copy & paste with only trivial adaptions from v2 -abstract class AbstractAwsSdkInstrumentationModule extends InstrumentationModule - implements ExperimentalInstrumentationModule { +abstract class AbstractAwsSdkInstrumentationModule extends InstrumentationModule { protected AbstractAwsSdkInstrumentationModule(String additionalInstrumentationName) { super("aws-sdk", "aws-sdk-1.11", additionalInstrumentationName); @@ -30,11 +28,6 @@ public boolean isHelperClass(String className) { return className.startsWith("io.opentelemetry.contrib.awsxray."); } - @Override - public String getModuleGroup() { - return "aws-sdk"; - } - @Override public ElementMatcher.Junction classLoaderMatcher() { // added in 1.10.33 diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/AwsSdkInstrumentationModule.java b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/AwsSdkInstrumentationModule.java index 89a4a6c8f673..048bbdfc41a6 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/AwsSdkInstrumentationModule.java +++ b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/AwsSdkInstrumentationModule.java @@ -10,12 +10,10 @@ import com.google.auto.service.AutoService; import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; -import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule; import java.util.List; @AutoService(InstrumentationModule.class) -public class AwsSdkInstrumentationModule extends InstrumentationModule - implements ExperimentalInstrumentationModule { +public class AwsSdkInstrumentationModule extends InstrumentationModule { public AwsSdkInstrumentationModule() { super("aws-sdk", "aws-sdk-1.11", "aws-sdk-1.11-core"); } @@ -25,11 +23,6 @@ public boolean isHelperClass(String className) { return className.startsWith("io.opentelemetry.contrib.awsxray."); } - @Override - public String getModuleGroup() { - return "aws-sdk"; - } - @Override public List typeInstrumentations() { return asList( diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v2_2/AbstractAwsSdkInstrumentationModule.java b/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v2_2/AbstractAwsSdkInstrumentationModule.java index 646873f066a9..537cc267857a 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v2_2/AbstractAwsSdkInstrumentationModule.java +++ b/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v2_2/AbstractAwsSdkInstrumentationModule.java @@ -12,23 +12,16 @@ import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer; -import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule; import java.util.List; import net.bytebuddy.description.type.TypeDescription; import net.bytebuddy.matcher.ElementMatcher; -abstract class AbstractAwsSdkInstrumentationModule extends InstrumentationModule - implements ExperimentalInstrumentationModule { +abstract class AbstractAwsSdkInstrumentationModule extends InstrumentationModule { protected AbstractAwsSdkInstrumentationModule(String additionalInstrumentationName) { super("aws-sdk", "aws-sdk-2.2", additionalInstrumentationName); } - @Override - public String getModuleGroup() { - return "aws-sdk-v2"; - } - @Override public boolean isHelperClass(String className) { return className.startsWith("io.opentelemetry.contrib.awsxray."); diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v2_2/AwsSdkInstrumentationModule.java b/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v2_2/AwsSdkInstrumentationModule.java index d286ffee2f88..b1f217d14c5b 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v2_2/AwsSdkInstrumentationModule.java +++ b/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v2_2/AwsSdkInstrumentationModule.java @@ -13,10 +13,12 @@ import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer; +import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule; import java.util.List; @AutoService(InstrumentationModule.class) -public class AwsSdkInstrumentationModule extends AbstractAwsSdkInstrumentationModule { +public class AwsSdkInstrumentationModule extends AbstractAwsSdkInstrumentationModule + implements ExperimentalInstrumentationModule { public AwsSdkInstrumentationModule() { super("aws-sdk-2.2-core"); } diff --git a/instrumentation/couchbase/couchbase-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseInstrumentationModule.java b/instrumentation/couchbase/couchbase-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseInstrumentationModule.java index a84dedfd5168..54cf73c67f37 100644 --- a/instrumentation/couchbase/couchbase-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseInstrumentationModule.java +++ b/instrumentation/couchbase/couchbase-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseInstrumentationModule.java @@ -34,11 +34,6 @@ public List typeInstrumentations() { return asList(new CouchbaseBucketInstrumentation(), new CouchbaseClusterInstrumentation()); } - @Override - public String getModuleGroup() { - return "couchbase"; - } - @Override public List injectedClassNames() { return singletonList("rx.OpenTelemetryTracingUtil"); diff --git a/instrumentation/couchbase/couchbase-2.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_6/CouchbaseInstrumentationModule.java b/instrumentation/couchbase/couchbase-2.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_6/CouchbaseInstrumentationModule.java index 639d9e06b5dc..7e6dad346415 100644 --- a/instrumentation/couchbase/couchbase-2.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_6/CouchbaseInstrumentationModule.java +++ b/instrumentation/couchbase/couchbase-2.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_6/CouchbaseInstrumentationModule.java @@ -11,13 +11,11 @@ import com.google.auto.service.AutoService; import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; -import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule; import java.util.List; import net.bytebuddy.matcher.ElementMatcher; @AutoService(InstrumentationModule.class) -public class CouchbaseInstrumentationModule extends InstrumentationModule - implements ExperimentalInstrumentationModule { +public class CouchbaseInstrumentationModule extends InstrumentationModule { public CouchbaseInstrumentationModule() { super("couchbase", "couchbase-2.6"); @@ -33,9 +31,4 @@ public ElementMatcher.Junction classLoaderMatcher() { public List typeInstrumentations() { return asList(new CouchbaseCoreInstrumentation(), new CouchbaseNetworkInstrumentation()); } - - @Override - public String getModuleGroup() { - return "couchbase"; - } } diff --git a/instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/api/client/v7_16/ElasticsearchApiClientInstrumentationModule.java b/instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/api/client/v7_16/ElasticsearchApiClientInstrumentationModule.java index 8f089d7ac70a..4d5be8959784 100644 --- a/instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/api/client/v7_16/ElasticsearchApiClientInstrumentationModule.java +++ b/instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/api/client/v7_16/ElasticsearchApiClientInstrumentationModule.java @@ -12,13 +12,11 @@ import com.google.auto.service.AutoService; import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; -import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule; import java.util.List; import net.bytebuddy.matcher.ElementMatcher; @AutoService(InstrumentationModule.class) -public class ElasticsearchApiClientInstrumentationModule extends InstrumentationModule - implements ExperimentalInstrumentationModule { +public class ElasticsearchApiClientInstrumentationModule extends InstrumentationModule { public ElasticsearchApiClientInstrumentationModule() { super("elasticsearch-api-client", "elasticsearch-api-client-7.16", "elasticsearch"); } @@ -32,11 +30,6 @@ public ElementMatcher.Junction classLoaderMatcher() { .and(not(hasClassesNamed("co.elastic.clients.transport.instrumentation.Instrumentation"))); } - @Override - public String getModuleGroup() { - return "elasticsearch"; - } - @Override public List typeInstrumentations() { return asList( diff --git a/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7InstrumentationModule.java b/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7InstrumentationModule.java index 44263ee21ccb..0f971fdde59d 100644 --- a/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7InstrumentationModule.java +++ b/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7InstrumentationModule.java @@ -12,13 +12,11 @@ import com.google.auto.service.AutoService; import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; -import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule; import java.util.List; import net.bytebuddy.matcher.ElementMatcher; @AutoService(InstrumentationModule.class) -public class ElasticsearchRest7InstrumentationModule extends InstrumentationModule - implements ExperimentalInstrumentationModule { +public class ElasticsearchRest7InstrumentationModule extends InstrumentationModule { public ElasticsearchRest7InstrumentationModule() { super("elasticsearch-rest", "elasticsearch-rest-7.0", "elasticsearch"); } @@ -32,11 +30,6 @@ public ElementMatcher.Junction classLoaderMatcher() { .and(not(hasClassesNamed("co.elastic.clients.transport.instrumentation.Instrumentation"))); } - @Override - public String getModuleGroup() { - return "elasticsearch"; - } - @Override public List typeInstrumentations() { return singletonList(new RestClientInstrumentation()); diff --git a/instrumentation/finagle-http-23.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/finaglehttp/v23_11/FinagleHttpInstrumentationModule.java b/instrumentation/finagle-http-23.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/finaglehttp/v23_11/FinagleHttpInstrumentationModule.java index 81658c6ca854..325c6b2cf44a 100644 --- a/instrumentation/finagle-http-23.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/finaglehttp/v23_11/FinagleHttpInstrumentationModule.java +++ b/instrumentation/finagle-http-23.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/finaglehttp/v23_11/FinagleHttpInstrumentationModule.java @@ -30,12 +30,6 @@ public List typeInstrumentations() { new H2StreamChannelInitInstrumentation()); } - @Override - public String getModuleGroup() { - // relies on netty and needs access to common netty instrumentation classes - return "netty"; - } - @Override public List injectedClassNames() { // these are injected so that they can access package-private members diff --git a/instrumentation/hibernate/hibernate-3.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/HibernateInstrumentationModule.java b/instrumentation/hibernate/hibernate-3.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/HibernateInstrumentationModule.java index cafd0c85f3f4..6ca1c19b15bb 100644 --- a/instrumentation/hibernate/hibernate-3.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/HibernateInstrumentationModule.java +++ b/instrumentation/hibernate/hibernate-3.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/HibernateInstrumentationModule.java @@ -11,13 +11,11 @@ import com.google.auto.service.AutoService; import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; -import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule; import java.util.List; import net.bytebuddy.matcher.ElementMatcher; @AutoService(InstrumentationModule.class) -public class HibernateInstrumentationModule extends InstrumentationModule - implements ExperimentalInstrumentationModule { +public class HibernateInstrumentationModule extends InstrumentationModule { public HibernateInstrumentationModule() { super("hibernate", "hibernate-3.3"); @@ -32,11 +30,6 @@ public ElementMatcher.Junction classLoaderMatcher() { "org.hibernate.transaction.JBossTransactionManagerLookup"); } - @Override - public String getModuleGroup() { - return "hibernate"; - } - @Override public List typeInstrumentations() { return asList( diff --git a/instrumentation/hibernate/hibernate-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/HibernateInstrumentationModule.java b/instrumentation/hibernate/hibernate-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/HibernateInstrumentationModule.java index 9b5baf389d90..81e5e766e903 100644 --- a/instrumentation/hibernate/hibernate-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/HibernateInstrumentationModule.java +++ b/instrumentation/hibernate/hibernate-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/HibernateInstrumentationModule.java @@ -11,13 +11,11 @@ import com.google.auto.service.AutoService; import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; -import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule; import java.util.List; import net.bytebuddy.matcher.ElementMatcher; @AutoService(InstrumentationModule.class) -public class HibernateInstrumentationModule extends InstrumentationModule - implements ExperimentalInstrumentationModule { +public class HibernateInstrumentationModule extends InstrumentationModule { public HibernateInstrumentationModule() { super("hibernate", "hibernate-4.0"); @@ -32,11 +30,6 @@ public ElementMatcher.Junction classLoaderMatcher() { "org.hibernate.Criteria"); } - @Override - public String getModuleGroup() { - return "hibernate"; - } - @Override public List typeInstrumentations() { return asList( diff --git a/instrumentation/hibernate/hibernate-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/HibernateInstrumentationModule.java b/instrumentation/hibernate/hibernate-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/HibernateInstrumentationModule.java index 388afd0ce37c..e754419ab459 100644 --- a/instrumentation/hibernate/hibernate-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/HibernateInstrumentationModule.java +++ b/instrumentation/hibernate/hibernate-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/HibernateInstrumentationModule.java @@ -11,13 +11,11 @@ import com.google.auto.service.AutoService; import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; -import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule; import java.util.List; import net.bytebuddy.matcher.ElementMatcher; @AutoService(InstrumentationModule.class) -public class HibernateInstrumentationModule extends InstrumentationModule - implements ExperimentalInstrumentationModule { +public class HibernateInstrumentationModule extends InstrumentationModule { public HibernateInstrumentationModule() { super("hibernate", "hibernate-6.0"); @@ -29,11 +27,6 @@ public ElementMatcher.Junction classLoaderMatcher() { return hasClassesNamed("org.hibernate.query.spi.SqmQuery"); } - @Override - public String getModuleGroup() { - return "hibernate"; - } - @Override public List typeInstrumentations() { return asList( diff --git a/instrumentation/hibernate/hibernate-procedure-call-4.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/procedure/call/v4_3/HibernateInstrumentationModule.java b/instrumentation/hibernate/hibernate-procedure-call-4.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/procedure/call/v4_3/HibernateInstrumentationModule.java index a24f4923fbd4..c424b2682770 100644 --- a/instrumentation/hibernate/hibernate-procedure-call-4.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/procedure/call/v4_3/HibernateInstrumentationModule.java +++ b/instrumentation/hibernate/hibernate-procedure-call-4.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/procedure/call/v4_3/HibernateInstrumentationModule.java @@ -11,13 +11,11 @@ import com.google.auto.service.AutoService; import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; -import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule; import java.util.List; import net.bytebuddy.matcher.ElementMatcher; @AutoService(InstrumentationModule.class) -public class HibernateInstrumentationModule extends InstrumentationModule - implements ExperimentalInstrumentationModule { +public class HibernateInstrumentationModule extends InstrumentationModule { public HibernateInstrumentationModule() { super("hibernate-procedure-call", "hibernate-procedure-call-4.3", "hibernate"); } @@ -28,11 +26,6 @@ public ElementMatcher.Junction classLoaderMatcher() { return hasClassesNamed("org.hibernate.procedure.ProcedureCall"); } - @Override - public String getModuleGroup() { - return "hibernate"; - } - @Override public List typeInstrumentations() { return asList(new ProcedureCallInstrumentation(), new SessionInstrumentation()); diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-jersey-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/jersey/v2_0/JerseyInstrumentationModule.java b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-jersey-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/jersey/v2_0/JerseyInstrumentationModule.java index fa7dac143129..210f36371776 100644 --- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-jersey-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/jersey/v2_0/JerseyInstrumentationModule.java +++ b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-jersey-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/jersey/v2_0/JerseyInstrumentationModule.java @@ -11,13 +11,11 @@ import com.google.auto.service.AutoService; import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; -import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule; import java.util.List; import net.bytebuddy.matcher.ElementMatcher; @AutoService(InstrumentationModule.class) -public class JerseyInstrumentationModule extends InstrumentationModule - implements ExperimentalInstrumentationModule { +public class JerseyInstrumentationModule extends InstrumentationModule { public JerseyInstrumentationModule() { super("jaxrs", "jaxrs-2.0", "jersey", "jersey-2.0"); } @@ -32,12 +30,6 @@ public ElementMatcher.Junction classLoaderMatcher() { "org.glassfish.jersey.server.ContainerRequest"); } - @Override - public String getModuleGroup() { - // depends on Servlet3SnippetInjectingResponseWrapper - return "servlet"; - } - @Override public List typeInstrumentations() { return asList( diff --git a/instrumentation/kotlinx-coroutines/kotlinx-coroutines-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kotlinxcoroutines/v1_0/KotlinCoroutinesInstrumentationModule.java b/instrumentation/kotlinx-coroutines/kotlinx-coroutines-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kotlinxcoroutines/v1_0/KotlinCoroutinesInstrumentationModule.java index 02747f183d6d..9cfc7b31b340 100644 --- a/instrumentation/kotlinx-coroutines/kotlinx-coroutines-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kotlinxcoroutines/v1_0/KotlinCoroutinesInstrumentationModule.java +++ b/instrumentation/kotlinx-coroutines/kotlinx-coroutines-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kotlinxcoroutines/v1_0/KotlinCoroutinesInstrumentationModule.java @@ -10,12 +10,10 @@ import com.google.auto.service.AutoService; import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; -import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule; import java.util.List; @AutoService(InstrumentationModule.class) -public class KotlinCoroutinesInstrumentationModule extends InstrumentationModule - implements ExperimentalInstrumentationModule { +public class KotlinCoroutinesInstrumentationModule extends InstrumentationModule { public KotlinCoroutinesInstrumentationModule() { super("kotlinx-coroutines", "kotlinx-coroutines-1.0"); @@ -26,12 +24,6 @@ public boolean isHelperClass(String className) { return className.startsWith("io.opentelemetry.extension.kotlin."); } - @Override - public String getModuleGroup() { - // This module uses the api context bridge helpers, therefore must be in the same classloader - return "opentelemetry-api-bridge"; - } - @Override public List typeInstrumentations() { return asList( diff --git a/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/NettyInstrumentationModule.java b/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/NettyInstrumentationModule.java index 40c92d0083f8..db5c9bb15687 100644 --- a/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/NettyInstrumentationModule.java +++ b/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/NettyInstrumentationModule.java @@ -11,13 +11,11 @@ import com.google.auto.service.AutoService; import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; -import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule; import java.util.List; import net.bytebuddy.matcher.ElementMatcher; @AutoService(InstrumentationModule.class) -public class NettyInstrumentationModule extends InstrumentationModule - implements ExperimentalInstrumentationModule { +public class NettyInstrumentationModule extends InstrumentationModule { public NettyInstrumentationModule() { super("netty", "netty-3.8"); } @@ -28,11 +26,6 @@ public ElementMatcher.Junction classLoaderMatcher() { return hasClassesNamed("org.jboss.netty.handler.codec.http.HttpMessage"); } - @Override - public String getModuleGroup() { - return "netty"; - } - @Override public List typeInstrumentations() { return asList( diff --git a/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/NettyInstrumentationModule.java b/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/NettyInstrumentationModule.java index d8dbe58f08ff..fb5149b28634 100644 --- a/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/NettyInstrumentationModule.java +++ b/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/NettyInstrumentationModule.java @@ -12,14 +12,12 @@ import com.google.auto.service.AutoService; import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; -import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule; import io.opentelemetry.javaagent.instrumentation.netty.common.v4_0.NettyFutureInstrumentation; import java.util.List; import net.bytebuddy.matcher.ElementMatcher; @AutoService(InstrumentationModule.class) -public class NettyInstrumentationModule extends InstrumentationModule - implements ExperimentalInstrumentationModule { +public class NettyInstrumentationModule extends InstrumentationModule { public NettyInstrumentationModule() { super("netty", "netty-4.0"); } @@ -32,11 +30,6 @@ public ElementMatcher.Junction classLoaderMatcher() { .and(not(hasClassesNamed("io.netty.handler.codec.http.CombinedHttpHeaders"))); } - @Override - public String getModuleGroup() { - return "netty"; - } - @Override public List typeInstrumentations() { return asList( diff --git a/instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/NettyInstrumentationModule.java b/instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/NettyInstrumentationModule.java index 9b1ced016ebf..1d2b37ff693d 100644 --- a/instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/NettyInstrumentationModule.java +++ b/instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/NettyInstrumentationModule.java @@ -11,14 +11,12 @@ import com.google.auto.service.AutoService; import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; -import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule; import io.opentelemetry.javaagent.instrumentation.netty.common.v4_0.NettyFutureInstrumentation; import java.util.List; import net.bytebuddy.matcher.ElementMatcher; @AutoService(InstrumentationModule.class) -public class NettyInstrumentationModule extends InstrumentationModule - implements ExperimentalInstrumentationModule { +public class NettyInstrumentationModule extends InstrumentationModule { public NettyInstrumentationModule() { super("netty", "netty-4.1"); } @@ -29,11 +27,6 @@ public ElementMatcher.Junction classLoaderMatcher() { return hasClassesNamed("io.netty.handler.codec.http.CombinedHttpHeaders"); } - @Override - public String getModuleGroup() { - return "netty"; - } - @Override public List typeInstrumentations() { return asList( diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_0/OpenTelemetryApiInstrumentationModule.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_0/OpenTelemetryApiInstrumentationModule.java index e3d2d9908183..033837b064fb 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_0/OpenTelemetryApiInstrumentationModule.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_0/OpenTelemetryApiInstrumentationModule.java @@ -34,11 +34,6 @@ public List typeInstrumentations() { new InstrumentationUtilInstrumentation()); } - @Override - public String getModuleGroup() { - return "opentelemetry-api-bridge"; - } - @Override public List agentPackagesToHide() { // These are helper classes injected by api-version specific instrumentation modules diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_0/TestInstrumentationModule.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_0/TestInstrumentationModule.java index e0d1894b1398..bb29be0f8d6c 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_0/TestInstrumentationModule.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_0/TestInstrumentationModule.java @@ -10,21 +10,14 @@ import com.google.auto.service.AutoService; import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; -import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule; import java.util.List; @AutoService(InstrumentationModule.class) -public class TestInstrumentationModule extends InstrumentationModule - implements ExperimentalInstrumentationModule { +public class TestInstrumentationModule extends InstrumentationModule { public TestInstrumentationModule() { super("test"); } - @Override - public String getModuleGroup() { - return "opentelemetry-api-bridge"; - } - @Override public List typeInstrumentations() { return singletonList(new TestInstrumentation()); diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/OpenTelemetryApiInstrumentationModule.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/OpenTelemetryApiInstrumentationModule.java index 062ed1db0d2d..0dfe8f283c04 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/OpenTelemetryApiInstrumentationModule.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/OpenTelemetryApiInstrumentationModule.java @@ -11,7 +11,6 @@ import com.google.auto.service.AutoService; import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; -import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.internal.V3PreviewFallbackEnabledInstrumentationModule; import java.util.List; import net.bytebuddy.matcher.ElementMatcher; @@ -19,8 +18,7 @@ @AutoService(InstrumentationModule.class) @SuppressWarnings("deprecation") // using v3 preview fallback helper until 3.0 public class OpenTelemetryApiInstrumentationModule - extends V3PreviewFallbackEnabledInstrumentationModule - implements ExperimentalInstrumentationModule { + extends V3PreviewFallbackEnabledInstrumentationModule { public OpenTelemetryApiInstrumentationModule() { super("opentelemetry-api", "opentelemetry-api-1.10"); @@ -36,9 +34,4 @@ public ElementMatcher.Junction classLoaderMatcher() { // added in 1.10 return hasClassesNamed("application.io.opentelemetry.api.metrics.LongGaugeBuilder"); } - - @Override - public String getModuleGroup() { - return "opentelemetry-api-bridge"; - } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.15/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_15/OpenTelemetryApiInstrumentationModule.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.15/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_15/OpenTelemetryApiInstrumentationModule.java index 73f1ad55afdc..c9f8d19b031c 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.15/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_15/OpenTelemetryApiInstrumentationModule.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.15/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_15/OpenTelemetryApiInstrumentationModule.java @@ -11,7 +11,6 @@ import com.google.auto.service.AutoService; import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; -import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.internal.V3PreviewFallbackEnabledInstrumentationModule; import java.util.List; import net.bytebuddy.matcher.ElementMatcher; @@ -19,8 +18,7 @@ @AutoService(InstrumentationModule.class) @SuppressWarnings("deprecation") // using v3 preview fallback helper until 3.0 public class OpenTelemetryApiInstrumentationModule - extends V3PreviewFallbackEnabledInstrumentationModule - implements ExperimentalInstrumentationModule { + extends V3PreviewFallbackEnabledInstrumentationModule { public OpenTelemetryApiInstrumentationModule() { super("opentelemetry-api", "opentelemetry-api-1.15"); } @@ -35,9 +33,4 @@ public ElementMatcher.Junction classLoaderMatcher() { // added in 1.15 return hasClassesNamed("application.io.opentelemetry.api.metrics.BatchCallback"); } - - @Override - public String getModuleGroup() { - return "opentelemetry-api-bridge"; - } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.27/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_27/OpenTelemetryApiInstrumentationModule.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.27/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_27/OpenTelemetryApiInstrumentationModule.java index a96e729eac7a..a2a6868d9fff 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.27/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_27/OpenTelemetryApiInstrumentationModule.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.27/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_27/OpenTelemetryApiInstrumentationModule.java @@ -11,7 +11,6 @@ import com.google.auto.service.AutoService; import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; -import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.internal.V3PreviewFallbackEnabledInstrumentationModule; import java.util.List; import net.bytebuddy.matcher.ElementMatcher; @@ -19,8 +18,7 @@ @AutoService(InstrumentationModule.class) @SuppressWarnings("deprecation") // using v3 preview fallback helper until 3.0 public class OpenTelemetryApiInstrumentationModule - extends V3PreviewFallbackEnabledInstrumentationModule - implements ExperimentalInstrumentationModule { + extends V3PreviewFallbackEnabledInstrumentationModule { public OpenTelemetryApiInstrumentationModule() { super("opentelemetry-api", "opentelemetry-api-1.27"); } @@ -35,9 +33,4 @@ public ElementMatcher.Junction classLoaderMatcher() { // added in 1.27 return hasClassesNamed("application.io.opentelemetry.api.logs.LoggerBuilder"); } - - @Override - public String getModuleGroup() { - return "opentelemetry-api-bridge"; - } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.31/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_31/incubator/OpenTelemetryApiInstrumentationModule.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.31/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_31/incubator/OpenTelemetryApiInstrumentationModule.java index 5e0f02685aec..c70b1f91353a 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.31/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_31/incubator/OpenTelemetryApiInstrumentationModule.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.31/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_31/incubator/OpenTelemetryApiInstrumentationModule.java @@ -11,7 +11,6 @@ import com.google.auto.service.AutoService; import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; -import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.internal.V3PreviewFallbackEnabledInstrumentationModule; import java.util.List; import net.bytebuddy.matcher.ElementMatcher; @@ -19,8 +18,7 @@ @AutoService(InstrumentationModule.class) @SuppressWarnings("deprecation") // using v3 preview fallback helper until 3.0 public class OpenTelemetryApiInstrumentationModule - extends V3PreviewFallbackEnabledInstrumentationModule - implements ExperimentalInstrumentationModule { + extends V3PreviewFallbackEnabledInstrumentationModule { public OpenTelemetryApiInstrumentationModule() { super("opentelemetry-api", "opentelemetry-api-1.31", "opentelemetry-api-incubator-1.31"); } @@ -36,9 +34,4 @@ public ElementMatcher.Junction classLoaderMatcher() { return hasClassesNamed( "application.io.opentelemetry.extension.incubator.metrics.ExtendedDoubleHistogramBuilder"); } - - @Override - public String getModuleGroup() { - return "opentelemetry-api-bridge"; - } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.32/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_32/OpenTelemetryApiInstrumentationModule.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.32/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_32/OpenTelemetryApiInstrumentationModule.java index 09d2fb3e9ab9..1f7c159bd468 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.32/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_32/OpenTelemetryApiInstrumentationModule.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.32/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_32/OpenTelemetryApiInstrumentationModule.java @@ -12,7 +12,6 @@ import com.google.auto.service.AutoService; import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; -import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.internal.V3PreviewFallbackEnabledInstrumentationModule; import java.util.List; import net.bytebuddy.matcher.ElementMatcher; @@ -20,8 +19,7 @@ @AutoService(InstrumentationModule.class) @SuppressWarnings("deprecation") // using v3 preview fallback helper until 3.0 public class OpenTelemetryApiInstrumentationModule - extends V3PreviewFallbackEnabledInstrumentationModule - implements ExperimentalInstrumentationModule { + extends V3PreviewFallbackEnabledInstrumentationModule { public OpenTelemetryApiInstrumentationModule() { super("opentelemetry-api", "opentelemetry-api-1.32"); } @@ -43,9 +41,4 @@ public ElementMatcher.Junction classLoaderMatcher() { public List typeInstrumentations() { return singletonList(new OpenTelemetryInstrumentation()); } - - @Override - public String getModuleGroup() { - return "opentelemetry-api-bridge"; - } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.32/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_32/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.32/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_32/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java index 35464305e866..2e81b1e4dbda 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.32/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_32/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.32/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_32/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java @@ -11,7 +11,6 @@ import com.google.auto.service.AutoService; import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; -import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.internal.V3PreviewFallbackEnabledInstrumentationModule; import java.util.List; import net.bytebuddy.matcher.ElementMatcher; @@ -19,8 +18,7 @@ @AutoService(InstrumentationModule.class) @SuppressWarnings("deprecation") // using v3 preview fallback helper until 3.0 public class OpenTelemetryApiIncubatorInstrumentationModule - extends V3PreviewFallbackEnabledInstrumentationModule - implements ExperimentalInstrumentationModule { + extends V3PreviewFallbackEnabledInstrumentationModule { public OpenTelemetryApiIncubatorInstrumentationModule() { super("opentelemetry-api", "opentelemetry-api-1.32", "opentelemetry-api-incubator-1.32"); } @@ -37,9 +35,4 @@ public ElementMatcher.Junction classLoaderMatcher() { public List typeInstrumentations() { return singletonList(new OpenTelemetryIncubatorInstrumentation()); } - - @Override - public String getModuleGroup() { - return "opentelemetry-api-bridge"; - } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.37/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_37/incubator/OpenTelemetryApiInstrumentationModule.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.37/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_37/incubator/OpenTelemetryApiInstrumentationModule.java index 57cc157223af..112b5384d534 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.37/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_37/incubator/OpenTelemetryApiInstrumentationModule.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.37/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_37/incubator/OpenTelemetryApiInstrumentationModule.java @@ -11,7 +11,6 @@ import com.google.auto.service.AutoService; import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; -import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.internal.V3PreviewFallbackEnabledInstrumentationModule; import java.util.List; import net.bytebuddy.matcher.ElementMatcher; @@ -19,8 +18,7 @@ @AutoService(InstrumentationModule.class) @SuppressWarnings("deprecation") // using v3 preview fallback helper until 3.0 public class OpenTelemetryApiInstrumentationModule - extends V3PreviewFallbackEnabledInstrumentationModule - implements ExperimentalInstrumentationModule { + extends V3PreviewFallbackEnabledInstrumentationModule { public OpenTelemetryApiInstrumentationModule() { super("opentelemetry-api", "opentelemetry-api-1.37", "opentelemetry-api-incubator-1.37"); } @@ -36,9 +34,4 @@ public ElementMatcher.Junction classLoaderMatcher() { public List typeInstrumentations() { return singletonList(new OpenTelemetryInstrumentation()); } - - @Override - public String getModuleGroup() { - return "opentelemetry-api-bridge"; - } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.38/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_38/OpenTelemetryApiInstrumentationModule.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.38/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_38/OpenTelemetryApiInstrumentationModule.java index 41574021382b..4b9e30d40871 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.38/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_38/OpenTelemetryApiInstrumentationModule.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.38/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_38/OpenTelemetryApiInstrumentationModule.java @@ -12,7 +12,6 @@ import com.google.auto.service.AutoService; import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; -import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.internal.V3PreviewFallbackEnabledInstrumentationModule; import java.util.List; import net.bytebuddy.matcher.ElementMatcher; @@ -20,8 +19,7 @@ @AutoService(InstrumentationModule.class) @SuppressWarnings("deprecation") // using v3 preview fallback helper until 3.0 public class OpenTelemetryApiInstrumentationModule - extends V3PreviewFallbackEnabledInstrumentationModule - implements ExperimentalInstrumentationModule { + extends V3PreviewFallbackEnabledInstrumentationModule { public OpenTelemetryApiInstrumentationModule() { super("opentelemetry-api", "opentelemetry-api-1.38"); } @@ -44,9 +42,4 @@ public ElementMatcher.Junction classLoaderMatcher() { public List typeInstrumentations() { return singletonList(new OpenTelemetryInstrumentation()); } - - @Override - public String getModuleGroup() { - return "opentelemetry-api-bridge"; - } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.38/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_38/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.38/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_38/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java index 79737686b4ea..4712c078d8ee 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.38/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_38/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.38/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_38/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java @@ -11,7 +11,6 @@ import com.google.auto.service.AutoService; import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; -import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.internal.V3PreviewFallbackEnabledInstrumentationModule; import java.util.List; import net.bytebuddy.matcher.ElementMatcher; @@ -19,8 +18,7 @@ @AutoService(InstrumentationModule.class) @SuppressWarnings("deprecation") // using v3 preview fallback helper until 3.0 public class OpenTelemetryApiIncubatorInstrumentationModule - extends V3PreviewFallbackEnabledInstrumentationModule - implements ExperimentalInstrumentationModule { + extends V3PreviewFallbackEnabledInstrumentationModule { public OpenTelemetryApiIncubatorInstrumentationModule() { super("opentelemetry-api", "opentelemetry-api-1.38", "opentelemetry-api-incubator-1.38"); } @@ -39,9 +37,4 @@ public ElementMatcher.Junction classLoaderMatcher() { public List typeInstrumentations() { return singletonList(new OpenTelemetryIncubatorInstrumentation()); } - - @Override - public String getModuleGroup() { - return "opentelemetry-api-bridge"; - } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_4/OpenTelemetryApiInstrumentationModule.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_4/OpenTelemetryApiInstrumentationModule.java index e4971836eec4..d164ae71ae3f 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_4/OpenTelemetryApiInstrumentationModule.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_4/OpenTelemetryApiInstrumentationModule.java @@ -10,15 +10,13 @@ import com.google.auto.service.AutoService; import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; -import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.internal.V3PreviewFallbackEnabledInstrumentationModule; import java.util.List; @AutoService(InstrumentationModule.class) @SuppressWarnings("deprecation") // using v3 preview fallback helper until 3.0 public class OpenTelemetryApiInstrumentationModule - extends V3PreviewFallbackEnabledInstrumentationModule - implements ExperimentalInstrumentationModule { + extends V3PreviewFallbackEnabledInstrumentationModule { public OpenTelemetryApiInstrumentationModule() { super("opentelemetry-api", "opentelemetry-api-1.4"); } @@ -27,9 +25,4 @@ public OpenTelemetryApiInstrumentationModule() { public List typeInstrumentations() { return singletonList(new OpenTelemetryInstrumentation()); } - - @Override - public String getModuleGroup() { - return "opentelemetry-api-bridge"; - } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java index d972a9d6c90a..8da428bce096 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java @@ -11,7 +11,6 @@ import com.google.auto.service.AutoService; import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; -import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.internal.V3PreviewFallbackEnabledInstrumentationModule; import java.util.List; import net.bytebuddy.matcher.ElementMatcher; @@ -19,8 +18,7 @@ @AutoService(InstrumentationModule.class) @SuppressWarnings("deprecation") // using v3 preview fallback helper until 3.0 public class OpenTelemetryApiIncubatorInstrumentationModule - extends V3PreviewFallbackEnabledInstrumentationModule - implements ExperimentalInstrumentationModule { + extends V3PreviewFallbackEnabledInstrumentationModule { public OpenTelemetryApiIncubatorInstrumentationModule() { super("opentelemetry-api", "opentelemetry-api-1.40", "opentelemetry-api-incubator-1.40"); } @@ -38,9 +36,4 @@ public ElementMatcher.Junction classLoaderMatcher() { public List typeInstrumentations() { return singletonList(new OpenTelemetryIncubatorInstrumentation()); } - - @Override - public String getModuleGroup() { - return "opentelemetry-api-bridge"; - } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.42/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_42/OpenTelemetryApiInstrumentationModule.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.42/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_42/OpenTelemetryApiInstrumentationModule.java index d5c062d0424d..0ff2f7d7b460 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.42/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_42/OpenTelemetryApiInstrumentationModule.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.42/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_42/OpenTelemetryApiInstrumentationModule.java @@ -12,7 +12,6 @@ import com.google.auto.service.AutoService; import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; -import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.internal.V3PreviewFallbackEnabledInstrumentationModule; import java.util.List; import net.bytebuddy.matcher.ElementMatcher; @@ -20,8 +19,7 @@ @AutoService(InstrumentationModule.class) @SuppressWarnings("deprecation") // using v3 preview fallback helper until 3.0 public class OpenTelemetryApiInstrumentationModule - extends V3PreviewFallbackEnabledInstrumentationModule - implements ExperimentalInstrumentationModule { + extends V3PreviewFallbackEnabledInstrumentationModule { public OpenTelemetryApiInstrumentationModule() { super("opentelemetry-api", "opentelemetry-api-1.42"); } @@ -39,9 +37,4 @@ public ElementMatcher.Junction classLoaderMatcher() { public List typeInstrumentations() { return singletonList(new OpenTelemetryInstrumentation()); } - - @Override - public String getModuleGroup() { - return "opentelemetry-api-bridge"; - } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.42/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_42/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.42/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_42/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java index 6b25549dc21d..517444b009eb 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.42/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_42/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.42/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_42/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java @@ -11,7 +11,6 @@ import com.google.auto.service.AutoService; import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; -import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.internal.V3PreviewFallbackEnabledInstrumentationModule; import java.util.List; import net.bytebuddy.matcher.ElementMatcher; @@ -19,8 +18,7 @@ @AutoService(InstrumentationModule.class) @SuppressWarnings("deprecation") // using v3 preview fallback helper until 3.0 public class OpenTelemetryApiIncubatorInstrumentationModule - extends V3PreviewFallbackEnabledInstrumentationModule - implements ExperimentalInstrumentationModule { + extends V3PreviewFallbackEnabledInstrumentationModule { public OpenTelemetryApiIncubatorInstrumentationModule() { super("opentelemetry-api", "opentelemetry-api-1.42", "opentelemetry-api-incubator-1.42"); } @@ -41,9 +39,4 @@ public ElementMatcher.Junction classLoaderMatcher() { public List typeInstrumentations() { return singletonList(new OpenTelemetryIncubatorInstrumentation()); } - - @Override - public String getModuleGroup() { - return "opentelemetry-api-bridge"; - } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.47/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_47/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.47/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_47/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java index f98b4c064431..67a2a0887632 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.47/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_47/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.47/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_47/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java @@ -12,7 +12,6 @@ import com.google.auto.service.AutoService; import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; -import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.internal.V3PreviewFallbackEnabledInstrumentationModule; import java.util.List; import net.bytebuddy.matcher.ElementMatcher; @@ -20,8 +19,7 @@ @AutoService(InstrumentationModule.class) @SuppressWarnings("deprecation") // using v3 preview fallback helper until 3.0 public class OpenTelemetryApiIncubatorInstrumentationModule - extends V3PreviewFallbackEnabledInstrumentationModule - implements ExperimentalInstrumentationModule { + extends V3PreviewFallbackEnabledInstrumentationModule { public OpenTelemetryApiIncubatorInstrumentationModule() { super("opentelemetry-api", "opentelemetry-api-1.47", "opentelemetry-api-incubator-1.47"); } @@ -50,9 +48,4 @@ public ElementMatcher.Junction classLoaderMatcher() { public List typeInstrumentations() { return singletonList(new OpenTelemetryIncubatorInstrumentation()); } - - @Override - public String getModuleGroup() { - return "opentelemetry-api-bridge"; - } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.50/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_50/OpenTelemetryApiInstrumentationModule.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.50/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_50/OpenTelemetryApiInstrumentationModule.java index 46f8f7f5357f..9f6e5a21bf19 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.50/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_50/OpenTelemetryApiInstrumentationModule.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.50/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_50/OpenTelemetryApiInstrumentationModule.java @@ -12,7 +12,6 @@ import com.google.auto.service.AutoService; import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; -import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.internal.V3PreviewFallbackEnabledInstrumentationModule; import java.util.List; import net.bytebuddy.matcher.ElementMatcher; @@ -20,8 +19,7 @@ @AutoService(InstrumentationModule.class) @SuppressWarnings("deprecation") // using v3 preview fallback helper until 3.0 public class OpenTelemetryApiInstrumentationModule - extends V3PreviewFallbackEnabledInstrumentationModule - implements ExperimentalInstrumentationModule { + extends V3PreviewFallbackEnabledInstrumentationModule { public OpenTelemetryApiInstrumentationModule() { super("opentelemetry-api", "opentelemetry-api-1.50"); } @@ -46,9 +44,4 @@ public ElementMatcher.Junction classLoaderMatcher() { public List typeInstrumentations() { return singletonList(new OpenTelemetryInstrumentation()); } - - @Override - public String getModuleGroup() { - return "opentelemetry-api-bridge"; - } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.50/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_50/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.50/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_50/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java index 46a047f1fbf4..7a1398200888 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.50/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_50/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.50/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_50/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java @@ -11,7 +11,6 @@ import com.google.auto.service.AutoService; import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; -import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.internal.V3PreviewFallbackEnabledInstrumentationModule; import java.util.List; import net.bytebuddy.matcher.ElementMatcher; @@ -19,8 +18,7 @@ @AutoService(InstrumentationModule.class) @SuppressWarnings("deprecation") // using v3 preview fallback helper until 3.0 public class OpenTelemetryApiIncubatorInstrumentationModule - extends V3PreviewFallbackEnabledInstrumentationModule - implements ExperimentalInstrumentationModule { + extends V3PreviewFallbackEnabledInstrumentationModule { public OpenTelemetryApiIncubatorInstrumentationModule() { super("opentelemetry-api", "opentelemetry-api-1.50", "opentelemetry-api-incubator-1.50"); } @@ -39,9 +37,4 @@ public ElementMatcher.Junction classLoaderMatcher() { public List typeInstrumentations() { return singletonList(new OpenTelemetryIncubatorInstrumentation()); } - - @Override - public String getModuleGroup() { - return "opentelemetry-api-bridge"; - } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.56/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_56/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.56/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_56/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java index 137a2cbfe585..661e1eeb9f84 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.56/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_56/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.56/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_56/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java @@ -11,7 +11,6 @@ import com.google.auto.service.AutoService; import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; -import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.internal.V3PreviewFallbackEnabledInstrumentationModule; import java.util.List; import net.bytebuddy.matcher.ElementMatcher; @@ -19,8 +18,7 @@ @AutoService(InstrumentationModule.class) @SuppressWarnings("deprecation") // using v3 preview fallback helper until 3.0 public class OpenTelemetryApiIncubatorInstrumentationModule - extends V3PreviewFallbackEnabledInstrumentationModule - implements ExperimentalInstrumentationModule { + extends V3PreviewFallbackEnabledInstrumentationModule { public OpenTelemetryApiIncubatorInstrumentationModule() { super("opentelemetry-api", "opentelemetry-api-1.56", "opentelemetry-api-incubator-1.56"); } @@ -39,9 +37,4 @@ public ElementMatcher.Junction classLoaderMatcher() { public List typeInstrumentations() { return singletonList(new OpenTelemetryIncubatorInstrumentation()); } - - @Override - public String getModuleGroup() { - return "opentelemetry-api-bridge"; - } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.57/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_57/OpenTelemetryApiInstrumentationModule.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.57/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_57/OpenTelemetryApiInstrumentationModule.java index 033a339778fc..5c3ca5b6a4ce 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.57/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_57/OpenTelemetryApiInstrumentationModule.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.57/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_57/OpenTelemetryApiInstrumentationModule.java @@ -10,15 +10,13 @@ import com.google.auto.service.AutoService; import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; -import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.internal.V3PreviewFallbackEnabledInstrumentationModule; import java.util.List; @AutoService(InstrumentationModule.class) @SuppressWarnings("deprecation") // using v3 preview fallback helper until 3.0 public class OpenTelemetryApiInstrumentationModule - extends V3PreviewFallbackEnabledInstrumentationModule - implements ExperimentalInstrumentationModule { + extends V3PreviewFallbackEnabledInstrumentationModule { public OpenTelemetryApiInstrumentationModule() { super("opentelemetry-api", "opentelemetry-api-1.57"); } @@ -27,9 +25,4 @@ public OpenTelemetryApiInstrumentationModule() { public List typeInstrumentations() { return singletonList(new OpenTelemetryInstrumentation()); } - - @Override - public String getModuleGroup() { - return "opentelemetry-api-bridge"; - } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.59/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_59/OpenTelemetryApiInstrumentationModule.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.59/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_59/OpenTelemetryApiInstrumentationModule.java index 3e195254d460..67d6885e1147 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.59/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_59/OpenTelemetryApiInstrumentationModule.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.59/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_59/OpenTelemetryApiInstrumentationModule.java @@ -11,7 +11,6 @@ import com.google.auto.service.AutoService; import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; -import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.internal.V3PreviewFallbackEnabledInstrumentationModule; import java.util.List; import net.bytebuddy.matcher.ElementMatcher; @@ -19,8 +18,7 @@ @AutoService(InstrumentationModule.class) @SuppressWarnings("deprecation") // using v3 preview fallback helper until 3.0 public class OpenTelemetryApiInstrumentationModule - extends V3PreviewFallbackEnabledInstrumentationModule - implements ExperimentalInstrumentationModule { + extends V3PreviewFallbackEnabledInstrumentationModule { public OpenTelemetryApiInstrumentationModule() { super("opentelemetry-api", "opentelemetry-api-1.59"); @@ -36,9 +34,4 @@ public ElementMatcher.Junction classLoaderMatcher() { public List typeInstrumentations() { return singletonList(new OpenTelemetryInstrumentation()); } - - @Override - public String getModuleGroup() { - return "opentelemetry-api-bridge"; - } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.63/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_63/OpenTelemetryApiInstrumentationModule.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.63/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_63/OpenTelemetryApiInstrumentationModule.java index b1daa7990bda..618be02000bf 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.63/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_63/OpenTelemetryApiInstrumentationModule.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.63/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_63/OpenTelemetryApiInstrumentationModule.java @@ -11,7 +11,6 @@ import com.google.auto.service.AutoService; import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; -import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.internal.V3PreviewFallbackEnabledInstrumentationModule; import java.util.List; import net.bytebuddy.matcher.ElementMatcher; @@ -19,8 +18,7 @@ @AutoService(InstrumentationModule.class) @SuppressWarnings("deprecation") // using v3 preview fallback helper until 3.0 public class OpenTelemetryApiInstrumentationModule - extends V3PreviewFallbackEnabledInstrumentationModule - implements ExperimentalInstrumentationModule { + extends V3PreviewFallbackEnabledInstrumentationModule { public OpenTelemetryApiInstrumentationModule() { super("opentelemetry-api", "opentelemetry-api-1.63"); } @@ -35,9 +33,4 @@ public ElementMatcher.Junction classLoaderMatcher() { public List typeInstrumentations() { return singletonList(new OpenTelemetryInstrumentation()); } - - @Override - public String getModuleGroup() { - return "opentelemetry-api-bridge"; - } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.63/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_63/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.63/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_63/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java index 1c841158de4d..9dd05ffa9ec7 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.63/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_63/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.63/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_63/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java @@ -11,7 +11,6 @@ import com.google.auto.service.AutoService; import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; -import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.internal.V3PreviewFallbackEnabledInstrumentationModule; import java.util.List; import net.bytebuddy.matcher.ElementMatcher; @@ -19,8 +18,7 @@ @AutoService(InstrumentationModule.class) @SuppressWarnings("deprecation") // using v3 preview fallback helper until 3.0 public class OpenTelemetryApiIncubatorInstrumentationModule - extends V3PreviewFallbackEnabledInstrumentationModule - implements ExperimentalInstrumentationModule { + extends V3PreviewFallbackEnabledInstrumentationModule { public OpenTelemetryApiIncubatorInstrumentationModule() { super("opentelemetry-api", "opentelemetry-api-1.63", "opentelemetry-api-incubator-1.63"); } @@ -39,9 +37,4 @@ public ElementMatcher.Junction classLoaderMatcher() { public List typeInstrumentations() { return singletonList(new OpenTelemetryIncubatorInstrumentation()); } - - @Override - public String getModuleGroup() { - return "opentelemetry-api-bridge"; - } } diff --git a/instrumentation/opentelemetry-extension-kotlin-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetry/extension/kotlin/v1_0/ContextExtensionInstrumentationModule.java b/instrumentation/opentelemetry-extension-kotlin-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetry/extension/kotlin/v1_0/ContextExtensionInstrumentationModule.java index 367e499bc7e8..b4849cd0db37 100644 --- a/instrumentation/opentelemetry-extension-kotlin-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetry/extension/kotlin/v1_0/ContextExtensionInstrumentationModule.java +++ b/instrumentation/opentelemetry-extension-kotlin-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetry/extension/kotlin/v1_0/ContextExtensionInstrumentationModule.java @@ -10,12 +10,10 @@ import com.google.auto.service.AutoService; import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; -import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule; import java.util.List; @AutoService(InstrumentationModule.class) -public class ContextExtensionInstrumentationModule extends InstrumentationModule - implements ExperimentalInstrumentationModule { +public class ContextExtensionInstrumentationModule extends InstrumentationModule { public ContextExtensionInstrumentationModule() { super("opentelemetry-extension-kotlin", "opentelemetry-extension-kotlin-1.0"); @@ -30,9 +28,4 @@ public boolean isHelperClass(String className) { public List typeInstrumentations() { return singletonList(new ContextExtensionInstrumentation()); } - - @Override - public String getModuleGroup() { - return "opentelemetry-api-bridge"; - } } diff --git a/instrumentation/opentelemetry-instrumentation-api/opentelemetry-instrumentation-api-1.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationapi/v1_14/InstrumentationApiInstrumentationModule.java b/instrumentation/opentelemetry-instrumentation-api/opentelemetry-instrumentation-api-1.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationapi/v1_14/InstrumentationApiInstrumentationModule.java index 957685d4f1a5..643dee6c151c 100644 --- a/instrumentation/opentelemetry-instrumentation-api/opentelemetry-instrumentation-api-1.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationapi/v1_14/InstrumentationApiInstrumentationModule.java +++ b/instrumentation/opentelemetry-instrumentation-api/opentelemetry-instrumentation-api-1.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationapi/v1_14/InstrumentationApiInstrumentationModule.java @@ -10,12 +10,10 @@ import com.google.auto.service.AutoService; import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; -import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule; import java.util.List; @AutoService(InstrumentationModule.class) -public class InstrumentationApiInstrumentationModule extends InstrumentationModule - implements ExperimentalInstrumentationModule { +public class InstrumentationApiInstrumentationModule extends InstrumentationModule { public InstrumentationApiInstrumentationModule() { super("opentelemetry-instrumentation-api", "opentelemetry-instrumentation-api-1.14"); @@ -25,9 +23,4 @@ public InstrumentationApiInstrumentationModule() { public List typeInstrumentations() { return asList(new HttpRouteStateInstrumentation(), new SpanKeyInstrumentation()); } - - @Override - public String getModuleGroup() { - return "opentelemetry-api-bridge"; - } } diff --git a/instrumentation/pekko/pekko-http-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/server/PekkoHttpServerInstrumentationModule.java b/instrumentation/pekko/pekko-http-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/server/PekkoHttpServerInstrumentationModule.java index 79bee8d34166..d5bd39ac247b 100644 --- a/instrumentation/pekko/pekko-http-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/server/PekkoHttpServerInstrumentationModule.java +++ b/instrumentation/pekko/pekko-http-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/server/PekkoHttpServerInstrumentationModule.java @@ -11,13 +11,11 @@ import com.google.auto.service.AutoService; import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; -import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule; import java.util.List; import net.bytebuddy.matcher.ElementMatcher; @AutoService(InstrumentationModule.class) -public class PekkoHttpServerInstrumentationModule extends InstrumentationModule - implements ExperimentalInstrumentationModule { +public class PekkoHttpServerInstrumentationModule extends InstrumentationModule { public PekkoHttpServerInstrumentationModule() { super("pekko-http", "pekko-http-1.0", "pekko-http-server"); } @@ -30,11 +28,6 @@ public ElementMatcher.Junction classLoaderMatcher() { return hasClassesNamed("org.apache.pekko.http.scaladsl.HttpExt"); } - @Override - public String getModuleGroup() { - return "pekko-server"; - } - @Override public List typeInstrumentations() { return asList( diff --git a/instrumentation/pekko/pekko-http-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/server/route/PekkoHttpServerRouteInstrumentationModule.java b/instrumentation/pekko/pekko-http-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/server/route/PekkoHttpServerRouteInstrumentationModule.java index 77b3b0d81955..323b38c532c6 100644 --- a/instrumentation/pekko/pekko-http-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/server/route/PekkoHttpServerRouteInstrumentationModule.java +++ b/instrumentation/pekko/pekko-http-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/server/route/PekkoHttpServerRouteInstrumentationModule.java @@ -10,7 +10,6 @@ import com.google.auto.service.AutoService; import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; -import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule; import java.util.List; /** @@ -18,17 +17,11 @@ * PekkoHttpServerInstrumentationModule applies to classes in pekko-http-core.jar */ @AutoService(InstrumentationModule.class) -public class PekkoHttpServerRouteInstrumentationModule extends InstrumentationModule - implements ExperimentalInstrumentationModule { +public class PekkoHttpServerRouteInstrumentationModule extends InstrumentationModule { public PekkoHttpServerRouteInstrumentationModule() { super("pekko-http", "pekko-http-1.0", "pekko-http-server", "pekko-http-server-route"); } - @Override - public String getModuleGroup() { - return "pekko-server"; - } - @Override public List typeInstrumentations() { return asList( diff --git a/instrumentation/pekko/pekko-http-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/server/tapir/TapirPekkoHttpServerRouteInstrumentationModule.java b/instrumentation/pekko/pekko-http-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/server/tapir/TapirPekkoHttpServerRouteInstrumentationModule.java index 8998e62b3191..2f73e4f08efd 100644 --- a/instrumentation/pekko/pekko-http-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/server/tapir/TapirPekkoHttpServerRouteInstrumentationModule.java +++ b/instrumentation/pekko/pekko-http-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/server/tapir/TapirPekkoHttpServerRouteInstrumentationModule.java @@ -10,12 +10,10 @@ import com.google.auto.service.AutoService; import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; -import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule; import java.util.List; @AutoService(InstrumentationModule.class) -public class TapirPekkoHttpServerRouteInstrumentationModule extends InstrumentationModule - implements ExperimentalInstrumentationModule { +public class TapirPekkoHttpServerRouteInstrumentationModule extends InstrumentationModule { public TapirPekkoHttpServerRouteInstrumentationModule() { super( "pekko-http", @@ -26,11 +24,6 @@ public TapirPekkoHttpServerRouteInstrumentationModule() { "tapir-pekko-http-server-route"); } - @Override - public String getModuleGroup() { - return "pekko-server"; - } - @Override public List typeInstrumentations() { return singletonList(new TapirPathInstrumentation()); diff --git a/instrumentation/ratpack/ratpack-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ratpack/v1_4/RatpackInstrumentationModule.java b/instrumentation/ratpack/ratpack-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ratpack/v1_4/RatpackInstrumentationModule.java index 5a0aa9efb721..192abd721dda 100644 --- a/instrumentation/ratpack/ratpack-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ratpack/v1_4/RatpackInstrumentationModule.java +++ b/instrumentation/ratpack/ratpack-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ratpack/v1_4/RatpackInstrumentationModule.java @@ -10,22 +10,14 @@ import com.google.auto.service.AutoService; import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; -import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule; import java.util.List; @AutoService(InstrumentationModule.class) -public class RatpackInstrumentationModule extends InstrumentationModule - implements ExperimentalInstrumentationModule { +public class RatpackInstrumentationModule extends InstrumentationModule { public RatpackInstrumentationModule() { super("ratpack", "ratpack-1.4"); } - @Override - public String getModuleGroup() { - // relies on netty - return "netty"; - } - @Override public List typeInstrumentations() { return asList( diff --git a/instrumentation/ratpack/ratpack-1.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ratpack/v1_7/RatpackInstrumentationModule.java b/instrumentation/ratpack/ratpack-1.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ratpack/v1_7/RatpackInstrumentationModule.java index b60e1bb219e4..a84f79ec1a56 100644 --- a/instrumentation/ratpack/ratpack-1.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ratpack/v1_7/RatpackInstrumentationModule.java +++ b/instrumentation/ratpack/ratpack-1.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ratpack/v1_7/RatpackInstrumentationModule.java @@ -11,23 +11,15 @@ import com.google.auto.service.AutoService; import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; -import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule; import java.util.List; import net.bytebuddy.matcher.ElementMatcher; @AutoService(InstrumentationModule.class) -public class RatpackInstrumentationModule extends InstrumentationModule - implements ExperimentalInstrumentationModule { +public class RatpackInstrumentationModule extends InstrumentationModule { public RatpackInstrumentationModule() { super("ratpack", "ratpack-1.7"); } - @Override - public String getModuleGroup() { - // relies on netty - return "netty"; - } - @Override public ElementMatcher.Junction classLoaderMatcher() { // added in 1.7.0 diff --git a/instrumentation/reactor/reactor-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/v3_1/ReactorInstrumentationModule.java b/instrumentation/reactor/reactor-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/v3_1/ReactorInstrumentationModule.java index 22a1571a62d6..31c1a1ff2d5d 100644 --- a/instrumentation/reactor/reactor-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/v3_1/ReactorInstrumentationModule.java +++ b/instrumentation/reactor/reactor-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/v3_1/ReactorInstrumentationModule.java @@ -10,23 +10,15 @@ import com.google.auto.service.AutoService; import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; -import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule; import java.util.List; @AutoService(InstrumentationModule.class) -public class ReactorInstrumentationModule extends InstrumentationModule - implements ExperimentalInstrumentationModule { +public class ReactorInstrumentationModule extends InstrumentationModule { public ReactorInstrumentationModule() { super("reactor", "reactor-3.1"); } - @Override - public String getModuleGroup() { - // needs to be in the same module as ContextPropagationOperatorInstrumentation - return "opentelemetry-api-bridge"; - } - @Override public List typeInstrumentations() { return singletonList(new HooksInstrumentation()); diff --git a/instrumentation/reactor/reactor-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/v3_1/operator/ContextPropagationOperatorInstrumentationModule.java b/instrumentation/reactor/reactor-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/v3_1/operator/ContextPropagationOperatorInstrumentationModule.java index eacd3163ac30..7abde2426420 100644 --- a/instrumentation/reactor/reactor-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/v3_1/operator/ContextPropagationOperatorInstrumentationModule.java +++ b/instrumentation/reactor/reactor-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/v3_1/operator/ContextPropagationOperatorInstrumentationModule.java @@ -11,13 +11,11 @@ import com.google.auto.service.AutoService; import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; -import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule; import java.util.List; import net.bytebuddy.matcher.ElementMatcher; @AutoService(InstrumentationModule.class) -public class ContextPropagationOperatorInstrumentationModule extends InstrumentationModule - implements ExperimentalInstrumentationModule { +public class ContextPropagationOperatorInstrumentationModule extends InstrumentationModule { public ContextPropagationOperatorInstrumentationModule() { super("reactor", "reactor-3.1", "reactor-context-propagation-operator"); @@ -33,10 +31,4 @@ public ElementMatcher.Junction classLoaderMatcher() { public List typeInstrumentations() { return singletonList(new ContextPropagationOperatorInstrumentation()); } - - @Override - public String getModuleGroup() { - // This module uses the api context bridge helpers, therefore must be in the same classloader - return "opentelemetry-api-bridge"; - } } diff --git a/instrumentation/reactor/reactor-3.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/v3_4/operator/ContextPropagationOperator34InstrumentationModule.java b/instrumentation/reactor/reactor-3.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/v3_4/operator/ContextPropagationOperator34InstrumentationModule.java index 4c4c726428ef..48e2862e7d9d 100644 --- a/instrumentation/reactor/reactor-3.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/v3_4/operator/ContextPropagationOperator34InstrumentationModule.java +++ b/instrumentation/reactor/reactor-3.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/v3_4/operator/ContextPropagationOperator34InstrumentationModule.java @@ -11,13 +11,11 @@ import com.google.auto.service.AutoService; import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; -import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule; import java.util.List; import net.bytebuddy.matcher.ElementMatcher; @AutoService(InstrumentationModule.class) -public class ContextPropagationOperator34InstrumentationModule extends InstrumentationModule - implements ExperimentalInstrumentationModule { +public class ContextPropagationOperator34InstrumentationModule extends InstrumentationModule { public ContextPropagationOperator34InstrumentationModule() { super("reactor", "reactor-3.4", "reactor-context-propagation-operator"); @@ -36,10 +34,4 @@ public ElementMatcher.Junction classLoaderMatcher() { public List typeInstrumentations() { return singletonList(new ContextPropagationOperator34Instrumentation()); } - - @Override - public String getModuleGroup() { - // This module uses the api context bridge helpers, therefore must be in the same classloader - return "opentelemetry-api-bridge"; - } } diff --git a/instrumentation/servlet/servlet-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/Servlet3InstrumentationModule.java b/instrumentation/servlet/servlet-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/Servlet3InstrumentationModule.java index 33540f75d5ec..0b627e7f61d9 100644 --- a/instrumentation/servlet/servlet-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/Servlet3InstrumentationModule.java +++ b/instrumentation/servlet/servlet-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/Servlet3InstrumentationModule.java @@ -11,7 +11,6 @@ import com.google.auto.service.AutoService; import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; -import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule; import io.opentelemetry.javaagent.instrumentation.servlet.common.async.AsyncContextInstrumentation; import io.opentelemetry.javaagent.instrumentation.servlet.common.async.AsyncContextStartInstrumentation; import io.opentelemetry.javaagent.instrumentation.servlet.common.async.AsyncStartInstrumentation; @@ -22,8 +21,7 @@ import net.bytebuddy.matcher.ElementMatcher; @AutoService(InstrumentationModule.class) -public class Servlet3InstrumentationModule extends InstrumentationModule - implements ExperimentalInstrumentationModule { +public class Servlet3InstrumentationModule extends InstrumentationModule { private static final String BASE_PACKAGE = "javax.servlet"; public Servlet3InstrumentationModule() { @@ -36,12 +34,6 @@ public ElementMatcher.Junction classLoaderMatcher() { return hasClassesNamed("javax.servlet.ServletRegistration"); } - @Override - public String getModuleGroup() { - // depends on servlet instrumentation - return "servlet"; - } - @Override public List typeInstrumentations() { return asList( diff --git a/instrumentation/spring/spring-cloud-aws-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/cloud/aws/v3_0/SpringAwsSqsInstrumentationModule.java b/instrumentation/spring/spring-cloud-aws-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/cloud/aws/v3_0/SpringAwsSqsInstrumentationModule.java index c4831aa8a336..f0327e67f6a9 100644 --- a/instrumentation/spring/spring-cloud-aws-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/cloud/aws/v3_0/SpringAwsSqsInstrumentationModule.java +++ b/instrumentation/spring/spring-cloud-aws-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/cloud/aws/v3_0/SpringAwsSqsInstrumentationModule.java @@ -10,12 +10,10 @@ import com.google.auto.service.AutoService; import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; -import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule; import java.util.List; @AutoService(InstrumentationModule.class) -public class SpringAwsSqsInstrumentationModule extends InstrumentationModule - implements ExperimentalInstrumentationModule { +public class SpringAwsSqsInstrumentationModule extends InstrumentationModule { public SpringAwsSqsInstrumentationModule() { super("spring-cloud-aws", "spring-cloud-aws-3.0"); @@ -26,11 +24,6 @@ public boolean isHelperClass(String className) { return className.startsWith("io.opentelemetry.contrib.awsxray."); } - @Override - public String getModuleGroup() { - return "aws-sdk-v2"; - } - @Override public List typeInstrumentations() { return asList( diff --git a/instrumentation/spring/spring-cloud-gateway/spring-cloud-gateway-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/cloud/gateway/v2_0/GatewayInstrumentationModule.java b/instrumentation/spring/spring-cloud-gateway/spring-cloud-gateway-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/cloud/gateway/v2_0/GatewayInstrumentationModule.java index e144489141e1..fd9440cabac8 100644 --- a/instrumentation/spring/spring-cloud-gateway/spring-cloud-gateway-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/cloud/gateway/v2_0/GatewayInstrumentationModule.java +++ b/instrumentation/spring/spring-cloud-gateway/spring-cloud-gateway-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/cloud/gateway/v2_0/GatewayInstrumentationModule.java @@ -10,12 +10,10 @@ import com.google.auto.service.AutoService; import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; -import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule; import java.util.List; @AutoService(InstrumentationModule.class) -public class GatewayInstrumentationModule extends InstrumentationModule - implements ExperimentalInstrumentationModule { +public class GatewayInstrumentationModule extends InstrumentationModule { public GatewayInstrumentationModule() { super("spring-cloud-gateway", "spring-cloud-gateway-2.0"); @@ -26,12 +24,6 @@ public List typeInstrumentations() { return singletonList(new HandlerAdapterInstrumentation()); } - @Override - public String getModuleGroup() { - // relies on netty - return "netty"; - } - @Override public int order() { // Later than Spring Webflux. diff --git a/instrumentation/spring/spring-security-config-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/security/config/v6_0/servlet/SpringSecurityConfigServletInstrumentationModule.java b/instrumentation/spring/spring-security-config-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/security/config/v6_0/servlet/SpringSecurityConfigServletInstrumentationModule.java index 7d9b849cc074..d2e00707bb4b 100644 --- a/instrumentation/spring/spring-security-config-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/security/config/v6_0/servlet/SpringSecurityConfigServletInstrumentationModule.java +++ b/instrumentation/spring/spring-security-config-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/security/config/v6_0/servlet/SpringSecurityConfigServletInstrumentationModule.java @@ -12,14 +12,12 @@ import io.opentelemetry.javaagent.bootstrap.internal.AgentCommonConfig; import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; -import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule; import java.util.List; import net.bytebuddy.matcher.ElementMatcher; /** Instrumentation module for servlet-based applications that use spring-security-config. */ @AutoService(InstrumentationModule.class) -public class SpringSecurityConfigServletInstrumentationModule extends InstrumentationModule - implements ExperimentalInstrumentationModule { +public class SpringSecurityConfigServletInstrumentationModule extends InstrumentationModule { public SpringSecurityConfigServletInstrumentationModule() { super( "spring-security-config", @@ -53,12 +51,6 @@ public ElementMatcher.Junction classLoaderMatcher() { "org.springframework.security.authentication.ObservationAuthenticationManager"); } - @Override - public String getModuleGroup() { - // depends on servlet instrumentation - return "servlet"; - } - @Override public List typeInstrumentations() { return singletonList(new HttpSecurityInstrumentation()); diff --git a/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/reactornetty/ReactorNettyInstrumentationModule.java b/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/reactornetty/ReactorNettyInstrumentationModule.java index d6a9ccf44397..e2e26007b701 100644 --- a/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/reactornetty/ReactorNettyInstrumentationModule.java +++ b/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/reactornetty/ReactorNettyInstrumentationModule.java @@ -10,23 +10,15 @@ import com.google.auto.service.AutoService; import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; -import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule; import java.util.List; @AutoService(InstrumentationModule.class) -public class ReactorNettyInstrumentationModule extends InstrumentationModule - implements ExperimentalInstrumentationModule { +public class ReactorNettyInstrumentationModule extends InstrumentationModule { public ReactorNettyInstrumentationModule() { super("spring-webflux", "spring-webflux-5.0", "reactor-netty", "reactor-netty-server"); } - @Override - public String getModuleGroup() { - // relies on netty - return "netty"; - } - @Override public List typeInstrumentations() { return asList(new HttpTrafficHandlerInstrumentation(), new ContextHandlerInstrumentation()); diff --git a/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v3_1/SpringWebMvcInstrumentationModule.java b/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v3_1/SpringWebMvcInstrumentationModule.java index d0ed0d966120..8f8d4dcccadf 100644 --- a/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v3_1/SpringWebMvcInstrumentationModule.java +++ b/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v3_1/SpringWebMvcInstrumentationModule.java @@ -42,11 +42,6 @@ public List exposedClassNames() { return singletonList("org.springframework.web.servlet.v3_1.OpenTelemetryHandlerMappingFilter"); } - @Override - public String getModuleGroup() { - return "servlet"; - } - @Override public List typeInstrumentations() { return asList(new DispatcherServletInstrumentation(), new HandlerAdapterInstrumentation()); diff --git a/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v3_1/springweb/SpringWebInstrumentationModule.java b/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v3_1/springweb/SpringWebInstrumentationModule.java index 5bc7480030da..bfd1a0103993 100644 --- a/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v3_1/springweb/SpringWebInstrumentationModule.java +++ b/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v3_1/springweb/SpringWebInstrumentationModule.java @@ -13,13 +13,11 @@ import io.opentelemetry.javaagent.extension.instrumentation.HelperResourceBuilder; import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; -import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule; import java.util.List; import net.bytebuddy.matcher.ElementMatcher; @AutoService(InstrumentationModule.class) -public class SpringWebInstrumentationModule extends InstrumentationModule - implements ExperimentalInstrumentationModule { +public class SpringWebInstrumentationModule extends InstrumentationModule { public SpringWebInstrumentationModule() { super("spring-webmvc", "spring-webmvc-3.1"); } @@ -42,12 +40,6 @@ public void registerHelperResources(HelperResourceBuilder helperResourceBuilder) "org/springframework/web/servlet/v3_1/OpenTelemetryHandlerMappingFilter.class"); } - @Override - public String getModuleGroup() { - // depends on OpenTelemetryHandlerMappingFilter - return "servlet"; - } - @Override public List typeInstrumentations() { return singletonList(new WebApplicationContextInstrumentation()); diff --git a/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v6_0/SpringWebMvcInstrumentationModule.java b/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v6_0/SpringWebMvcInstrumentationModule.java index 2f999c37d7f1..cc497b4d58c4 100644 --- a/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v6_0/SpringWebMvcInstrumentationModule.java +++ b/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v6_0/SpringWebMvcInstrumentationModule.java @@ -42,11 +42,6 @@ public List exposedClassNames() { return singletonList("org.springframework.web.servlet.v6_0.OpenTelemetryHandlerMappingFilter"); } - @Override - public String getModuleGroup() { - return "servlet"; - } - @Override public List typeInstrumentations() { return asList(new DispatcherServletInstrumentation(), new HandlerAdapterInstrumentation()); diff --git a/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v6_0/springweb/SpringWebInstrumentationModule.java b/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v6_0/springweb/SpringWebInstrumentationModule.java index 8626032ce6c4..4ea2d54a8077 100644 --- a/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v6_0/springweb/SpringWebInstrumentationModule.java +++ b/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v6_0/springweb/SpringWebInstrumentationModule.java @@ -12,13 +12,11 @@ import io.opentelemetry.javaagent.extension.instrumentation.HelperResourceBuilder; import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; -import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule; import java.util.List; import net.bytebuddy.matcher.ElementMatcher; @AutoService(InstrumentationModule.class) -public class SpringWebInstrumentationModule extends InstrumentationModule - implements ExperimentalInstrumentationModule { +public class SpringWebInstrumentationModule extends InstrumentationModule { public SpringWebInstrumentationModule() { super("spring-webmvc", "spring-webmvc-6.0"); @@ -40,12 +38,6 @@ public void registerHelperResources(HelperResourceBuilder helperResourceBuilder) "org/springframework/web/servlet/v6_0/OpenTelemetryHandlerMappingFilter.class"); } - @Override - public String getModuleGroup() { - // depends on OpenTelemetryHandlerMappingFilter - return "servlet"; - } - @Override public List typeInstrumentations() { return singletonList(new WebApplicationContextInstrumentation()); diff --git a/javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/extension/instrumentation/internal/ExperimentalInstrumentationModule.java b/javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/extension/instrumentation/internal/ExperimentalInstrumentationModule.java index 705506e831fa..63f2a76b3a50 100644 --- a/javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/extension/instrumentation/internal/ExperimentalInstrumentationModule.java +++ b/javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/extension/instrumentation/internal/ExperimentalInstrumentationModule.java @@ -8,7 +8,6 @@ import static java.util.Collections.emptyList; import static java.util.Collections.emptyMap; -import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule; import java.util.List; import java.util.Map; import java.util.function.BiConsumer; @@ -34,18 +33,6 @@ default List injectedClassNames() { return emptyList(); } - /** - * By default every InstrumentationModule is loaded by an isolated classloader, even if multiple - * modules instrument the same application classloader. - * - *

Sometimes this is not desired, e.g. when instrumenting modular libraries such as the AWS - * SDK. In such cases the {@link InstrumentationModule}s which want to share a classloader can - * return the same group name from this method. - */ - default String getModuleGroup() { - return getClass().getName(); - } - /** * Some instrumentations need to invoke classes which are present both in the agent classloader * and the instrumented application classloader. By default, the classloader of the diff --git a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/instrumentation/indy/IndyModuleRegistry.java b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/instrumentation/indy/IndyModuleRegistry.java index f55ac321a2eb..4a9532982334 100644 --- a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/instrumentation/indy/IndyModuleRegistry.java +++ b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/instrumentation/indy/IndyModuleRegistry.java @@ -8,11 +8,13 @@ import io.opentelemetry.javaagent.bootstrap.InstrumentationHolder; import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule; +import io.opentelemetry.javaagent.tooling.ExtensionClassLoader; import io.opentelemetry.javaagent.tooling.ModuleOpener; import io.opentelemetry.javaagent.tooling.util.ClassLoaderValue; import java.lang.instrument.Instrumentation; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +import javax.annotation.Nullable; import net.bytebuddy.agent.builder.AgentBuilder; import net.bytebuddy.utility.JavaModule; @@ -25,15 +27,22 @@ private IndyModuleRegistry() {} /** * Weakly references the {@link InstrumentationModuleClassLoader}s for a given application class - * loader. The {@link InstrumentationModuleClassLoader} are kept alive by a strong reference from - * the instrumented class loader realized via {@link ClassLoaderValue}. - * - *

The keys of the contained map are the instrumentation module group names, see {@link - * ExperimentalInstrumentationModule#getModuleGroup()}; + * loader for the internal instrumentation. The {@link InstrumentationModuleClassLoader} are kept + * alive by a strong reference from the instrumented class loader realized via {@link + * ClassLoaderValue}. */ - private static final ClassLoaderValue> + private static final ClassLoaderValue instrumentationClassLoaders = new ClassLoaderValue<>(); + /** + * Weakly references the {@link InstrumentationModuleClassLoader}s for a given application class + * loader with extension class loader as key. The {@link InstrumentationModuleClassLoader} are + * kept alive by a strong reference from the instrumented class loader realized via {@link + * ClassLoaderValue}. + */ + private static final ClassLoaderValue> + extensionsInstrumentationClassLoaders = new ClassLoaderValue<>(); + public static InstrumentationModuleClassLoader getInstrumentationClassLoader( String moduleClassName, ClassLoader instrumentedClassLoader) { InstrumentationModule instrumentationModule = modulesByClassName.get(moduleClassName); @@ -47,20 +56,10 @@ public static InstrumentationModuleClassLoader getInstrumentationClassLoader( public static InstrumentationModuleClassLoader getInstrumentationClassLoader( InstrumentationModule module, ClassLoader instrumentedClassLoader) { - String groupName = getModuleGroup(module); - - Map loadersByGroupName = - instrumentationClassLoaders.get(instrumentedClassLoader); - - if (loadersByGroupName == null) { - throw new IllegalArgumentException( - module - + " has not been initialized for class loader " - + instrumentedClassLoader - + " yet"); - } + ClassLoader moduleCl = module.getClass().getClassLoader(); + InstrumentationModuleClassLoader loader = + lookupInstrumentationClassLoader(instrumentedClassLoader, moduleCl); - InstrumentationModuleClassLoader loader = loadersByGroupName.get(groupName); if (loader == null || !loader.hasModuleInstalled(module)) { throw new IllegalArgumentException( module @@ -90,10 +89,25 @@ public static InstrumentationModuleClassLoader getInstrumentationClassLoader( return loader; } + @Nullable + private static InstrumentationModuleClassLoader lookupInstrumentationClassLoader( + ClassLoader instrumentedClassLoader, ClassLoader moduleCl) { + if (!(moduleCl instanceof ExtensionClassLoader)) { + // internal instrumentation is using one CL per instrumented CL. + return instrumentationClassLoaders.get(instrumentedClassLoader); + } + // extension module needs to use a common CL per extension and instrumented CL. + Map map = + extensionsInstrumentationClassLoaders.get(instrumentedClassLoader); + if (map != null) { + return map.get(moduleCl); + } + return null; + } + /** * Returns a newly created class loader containing only the provided module. Note that other - * modules from the same module group (see {@link #getModuleGroup(InstrumentationModule)}) will - * not be installed in this class loader. + * modules from the same module group will not be installed in this class loader. */ public static InstrumentationModuleClassLoader createInstrumentationClassLoaderForMuzzle( InstrumentationModule module, ClassLoader instrumentedClassLoader) { @@ -124,23 +138,25 @@ private static void initializeModuleLoaderForClassLoader( InstrumentationModule module, ClassLoader classLoader) { ClassLoader agentOrExtensionCl = module.getClass().getClassLoader(); - - String groupName = getModuleGroup(module); - - InstrumentationModuleClassLoader moduleCl = - instrumentationClassLoaders - .computeIfAbsent(classLoader, ConcurrentHashMap::new) - .computeIfAbsent( - groupName, - unused -> new InstrumentationModuleClassLoader(classLoader, agentOrExtensionCl)); + InstrumentationModuleClassLoader moduleCl; + if (!(agentOrExtensionCl instanceof ExtensionClassLoader)) { + // non-extension modules are loaded in a common InstrumentationModuleClassLoader per + // instrumented CL + moduleCl = + instrumentationClassLoaders.computeIfAbsent( + classLoader, + () -> new InstrumentationModuleClassLoader(classLoader, agentOrExtensionCl)); + } else { + // extension modules are loaded in a common InstrumentationModuleCLassLoader per extension and + // instrumented CL + moduleCl = + extensionsInstrumentationClassLoaders + .computeIfAbsent(classLoader, ConcurrentHashMap::new) + .computeIfAbsent( + (ExtensionClassLoader) agentOrExtensionCl, + k -> new InstrumentationModuleClassLoader(classLoader, agentOrExtensionCl)); + } moduleCl.installModule(module); } - - private static String getModuleGroup(InstrumentationModule module) { - if (module instanceof ExperimentalInstrumentationModule) { - return ((ExperimentalInstrumentationModule) module).getModuleGroup(); - } - return module.getClass().getName(); - } } diff --git a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/instrumentation/indy/InstrumentationModuleClassLoader.java b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/instrumentation/indy/InstrumentationModuleClassLoader.java index 7f2215f9640c..dac14604356d 100644 --- a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/instrumentation/indy/InstrumentationModuleClassLoader.java +++ b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/instrumentation/indy/InstrumentationModuleClassLoader.java @@ -148,9 +148,14 @@ void installModule(InstrumentationModule module) { } synchronized void installModule(InstrumentationModule module, boolean forMuzzleCheck) { - if (module.getClass().getClassLoader() != agentOrExtensionCl) { + ClassLoader moduleCl = module.getClass().getClassLoader(); + if (moduleCl != agentOrExtensionCl) { throw new IllegalArgumentException( - module.getClass().getName() + " is not loaded by " + agentOrExtensionCl); + module.getClass().getName() + + " is not loaded by " + + agentOrExtensionCl + + " but is loaded by " + + moduleCl); } if (!installedModules.add(module)) { return;