[wip] remove getModuleGroup

instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/v10_0/package-info.java

@@ -0,0 +1,5 @@
+@ClassLoadingStrategy(ClassLoadingTarget.INSTRUMENTATION_SHARED)
+package io.opentelemetry.javaagent.instrumentation.akkahttp.v10_0;
+
+import io.opentelemetry.javaagent.extension.instrumentation.internal.ClassLoadingStrategy;
+import io.opentelemetry.javaagent.extension.instrumentation.internal.ClassLoadingTarget;

instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/v10_0/server/AkkaHttpServerInstrumentationModule.java

@@ -22,11 +22,6 @@ public AkkaHttpServerInstrumentationModule() {
     super("akka-http", "akka-http-10.0", "akka-http-server");
   }
 
-  @Override
-  public String getModuleGroup() {
-    return "akka-http";
-  }
-
   @Override
   public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
     // in GraphInterpreterInstrumentation we instrument a class that belongs to akka-streams, make

instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/v10_0/server/package-info.java

@@ -0,0 +1,5 @@
+@ClassLoadingStrategy(ClassLoadingTarget.INSTRUMENTATION_SHARED)
+package io.opentelemetry.javaagent.instrumentation.akkahttp.v10_0.server;
+
+import io.opentelemetry.javaagent.extension.instrumentation.internal.ClassLoadingStrategy;
+import io.opentelemetry.javaagent.extension.instrumentation.internal.ClassLoadingTarget;

instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/v10_0/server/route/AkkaHttpServerRouteInstrumentationModule.java

@@ -24,11 +24,6 @@ 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<TypeInstrumentation> typeInstrumentations() {
     return asList(

instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/v10_0/server/route/package-info.java

@@ -0,0 +1,5 @@
+@ClassLoadingStrategy(ClassLoadingTarget.INSTRUMENTATION_SHARED)
+package io.opentelemetry.javaagent.instrumentation.akkahttp.v10_0.server.route;
+
+import io.opentelemetry.javaagent.extension.instrumentation.internal.ClassLoadingStrategy;
+import io.opentelemetry.javaagent.extension.instrumentation.internal.ClassLoadingTarget;

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<ClassLoader> classLoaderMatcher() {
     // added in 1.10.33

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<TypeInstrumentation> typeInstrumentations() {
     return asList(

instrumentation/aws-sdk/aws-sdk-1.11/library-autoconfigure/build.gradle.kts

@@ -18,6 +18,8 @@ dependencies {
   testLibrary("com.amazonaws:aws-java-sdk-dynamodb:1.11.106")
   testLibrary("com.amazonaws:aws-java-sdk-sns:1.11.106")
   testLibrary("com.amazonaws:aws-java-sdk-sqs:1.11.106")
+
+  compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api")
 }
 
 tasks {

instrumentation/aws-sdk/aws-sdk-1.11/library/build.gradle.kts

@@ -19,6 +19,8 @@ dependencies {
   testLibrary("com.amazonaws:aws-java-sdk-s3:1.11.106")
   testLibrary("com.amazonaws:aws-java-sdk-sns:1.11.106")
   testLibrary("com.amazonaws:aws-java-sdk-stepfunctions:1.11.106")
+
+  compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api")
 }
 
 if (!otelProps.testLatestDeps) {

instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/package-info.java

@@ -0,0 +1,5 @@
+@ClassLoadingStrategy(ClassLoadingTarget.INSTRUMENTATION_SHARED)
+package io.opentelemetry.instrumentation.awssdk.v1_11;
+
+import io.opentelemetry.javaagent.extension.instrumentation.internal.ClassLoadingStrategy;
+import io.opentelemetry.javaagent.extension.instrumentation.internal.ClassLoadingTarget;

instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v2_2/AbstractAwsSdkInstrumentationModule.java

@@ -24,11 +24,6 @@ protected AbstractAwsSdkInstrumentationModule(String additionalInstrumentationNa
     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.");

instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v2_2/package-info.java

@@ -0,0 +1,5 @@
+@ClassLoadingStrategy(ClassLoadingTarget.INSTRUMENTATION_SHARED)
+package io.opentelemetry.javaagent.instrumentation.awssdk.v2_2;
+
+import io.opentelemetry.javaagent.extension.instrumentation.internal.ClassLoadingStrategy;
+import io.opentelemetry.javaagent.extension.instrumentation.internal.ClassLoadingTarget;

instrumentation/aws-sdk/aws-sdk-2.2/library/build.gradle.kts

@@ -30,6 +30,8 @@ dependencies {
   testLibrary("software.amazon.awssdk:secretsmanager:2.2.0")
   testLibrary("software.amazon.awssdk:ses:2.2.0")
   testLibrary("software.amazon.awssdk:sfn:2.2.0")
+
+  compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api")
 }
 
 testing {

instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/internal/package-info.java

@@ -0,0 +1,5 @@
+@ClassLoadingStrategy(ClassLoadingTarget.INSTRUMENTATION_SHARED)
+package io.opentelemetry.instrumentation.awssdk.v2_2.internal;
+
+import io.opentelemetry.javaagent.extension.instrumentation.internal.ClassLoadingStrategy;
+import io.opentelemetry.javaagent.extension.instrumentation.internal.ClassLoadingTarget;

instrumentation/couchbase/couchbase-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseInstrumentationModule.java

@@ -34,11 +34,6 @@ public List<TypeInstrumentation> typeInstrumentations() {
     return asList(new CouchbaseBucketInstrumentation(), new CouchbaseClusterInstrumentation());
   }
 
-  @Override
-  public String getModuleGroup() {
-    return "couchbase";
-  }
-
   @Override
   public List<String> injectedClassNames() {
     return singletonList("rx.OpenTelemetryTracingUtil");

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<ClassLoader> classLoaderMatcher() {
   public List<TypeInstrumentation> typeInstrumentations() {
     return asList(new CouchbaseCoreInstrumentation(), new CouchbaseNetworkInstrumentation());
   }
-
-  @Override
-  public String getModuleGroup() {
-    return "couchbase";
-  }
 }

instrumentation/couchbase/couchbase-common-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/common/v2_0/package-info.java

@@ -0,0 +1,5 @@
+@ClassLoadingStrategy(ClassLoadingTarget.INSTRUMENTATION_SHARED)
+package io.opentelemetry.javaagent.instrumentation.couchbase.common.v2_0;
+
+import io.opentelemetry.javaagent.extension.instrumentation.internal.ClassLoadingStrategy;
+import io.opentelemetry.javaagent.extension.instrumentation.internal.ClassLoadingTarget;

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<ClassLoader> classLoaderMatcher() {
         .and(not(hasClassesNamed("co.elastic.clients.transport.instrumentation.Instrumentation")));
   }
 
-  @Override
-  public String getModuleGroup() {
-    return "elasticsearch";
-  }
-
   @Override
   public List<TypeInstrumentation> typeInstrumentations() {
     return asList(

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<ClassLoader> classLoaderMatcher() {
         .and(not(hasClassesNamed("co.elastic.clients.transport.instrumentation.Instrumentation")));
   }
 
-  @Override
-  public String getModuleGroup() {
-    return "elasticsearch";
-  }
-
   @Override
   public List<TypeInstrumentation> typeInstrumentations() {
     return singletonList(new RestClientInstrumentation());

instrumentation/elasticsearch/elasticsearch-rest-common-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/common/v5_0/ElasticsearchRestJavaagentInstrumenterFactory.java

@@ -13,9 +13,12 @@
 import io.opentelemetry.instrumentation.elasticsearch.rest.common.v5_0.internal.ElasticsearchRestInstrumenterFactory;
 import io.opentelemetry.instrumentation.elasticsearch.rest.common.v5_0.internal.ElasticsearchRestRequest;
 import io.opentelemetry.javaagent.bootstrap.internal.AgentCommonConfig;
+import io.opentelemetry.javaagent.extension.instrumentation.internal.ClassLoadingStrategy;
+import io.opentelemetry.javaagent.extension.instrumentation.internal.ClassLoadingTarget;
 import java.util.function.Function;
 import org.elasticsearch.client.Response;
 
+@ClassLoadingStrategy(ClassLoadingTarget.INSTRUMENTATION_SHARED)
 public class ElasticsearchRestJavaagentInstrumenterFactory {
 
   private static final boolean CAPTURE_SEARCH_QUERY =

instrumentation/elasticsearch/elasticsearch-rest-common-5.0/library/build.gradle.kts

@@ -7,4 +7,6 @@ dependencies {
   compileOnly("com.google.auto.value:auto-value-annotations")
 
   annotationProcessor("com.google.auto.value:auto-value")
+
+  compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api")
 }

instrumentation/elasticsearch/elasticsearch-rest-common-5.0/library/src/main/java/io/opentelemetry/instrumentation/elasticsearch/rest/common/v5_0/internal/package-info.java

@@ -0,0 +1,5 @@
+@ClassLoadingStrategy(ClassLoadingTarget.INSTRUMENTATION_SHARED)
+package io.opentelemetry.instrumentation.elasticsearch.rest.common.v5_0.internal;
+
+import io.opentelemetry.javaagent.extension.instrumentation.internal.ClassLoadingStrategy;
+import io.opentelemetry.javaagent.extension.instrumentation.internal.ClassLoadingTarget;

instrumentation/finagle-http-23.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/finaglehttp/v23_11/FinagleHttpInstrumentationModule.java

@@ -30,12 +30,6 @@ public List<TypeInstrumentation> typeInstrumentations() {
         new H2StreamChannelInitInstrumentation());
   }
 
-  @Override
-  public String getModuleGroup() {
-    // relies on netty and needs access to common netty instrumentation classes
-    return "netty";
-  }
-
   @Override
   public List<String> injectedClassNames() {
     // these are injected so that they can access package-private members

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<ClassLoader> classLoaderMatcher() {
         "org.hibernate.transaction.JBossTransactionManagerLookup");
   }
 
-  @Override
-  public String getModuleGroup() {
-    return "hibernate";
-  }
-
   @Override
   public List<TypeInstrumentation> typeInstrumentations() {
     return asList(

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<ClassLoader> classLoaderMatcher() {
         "org.hibernate.Criteria");
   }
 
-  @Override
-  public String getModuleGroup() {
-    return "hibernate";
-  }
-
   @Override
   public List<TypeInstrumentation> typeInstrumentations() {
     return asList(

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<ClassLoader> classLoaderMatcher() {
     return hasClassesNamed("org.hibernate.query.spi.SqmQuery");
   }
 
-  @Override
-  public String getModuleGroup() {
-    return "hibernate";
-  }
-
   @Override
   public List<TypeInstrumentation> typeInstrumentations() {
     return asList(

instrumentation/hibernate/hibernate-common-3.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/common/v3_3/package-info.java

@@ -0,0 +1,5 @@
+@ClassLoadingStrategy(ClassLoadingTarget.INSTRUMENTATION_SHARED)
+package io.opentelemetry.javaagent.instrumentation.hibernate.common.v3_3;
+
+import io.opentelemetry.javaagent.extension.instrumentation.internal.ClassLoadingStrategy;
+import io.opentelemetry.javaagent.extension.instrumentation.internal.ClassLoadingTarget;