move aws-sdk to open-telemetry#11552

SylvainJuge · Jun 11, 2024 · ac0e649 · ac0e649
1 parent 25660bd
commit ac0e649
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/...telemetry/javaagent/instrumentation/awssdk/v1_11/AbstractAwsSdkInstrumentationModule.java b/...telemetry/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);
@@ -31,8 +29,8 @@ public boolean isHelperClass(String className) {
   }
 
   @Override
-  public String getModuleGroup() {
-    return "aws-sdk";
+  public boolean isIndyModule() {
+    return false;
   }
 
   @Override

diff --git a/.../io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/AwsSdkInstrumentationModule.java b/.../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");
   }
@@ -26,8 +24,8 @@ public boolean isHelperClass(String className) {
   }
 
   @Override
-  public String getModuleGroup() {
-    return "aws-sdk";
+  public boolean isIndyModule() {
+    return false;
   }
 
   @Override