From b2800e935cf2dddf2ac81d5c7c8a01ac150e7b81 Mon Sep 17 00:00:00 2001
From: SylvainJuge <763082+SylvainJuge@users.noreply.github.com>
Date: Wed, 19 Jun 2024 16:27:09 +0200
Subject: [PATCH] make aws-sdk indy compatible (#11552)

---
 .../awssdk/v1_11/AbstractAwsSdkInstrumentationModule.java | 8 +++++---
 .../awssdk/v1_11/AwsSdkInstrumentationModule.java         | 8 +++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

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 a3aa56398c7d..ff02429b910c 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,12 +12,14 @@
 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 {
+abstract class AbstractAwsSdkInstrumentationModule extends InstrumentationModule
+    implements ExperimentalInstrumentationModule {
 
   protected AbstractAwsSdkInstrumentationModule(String additionalInstrumentationName) {
     super("aws-sdk", "aws-sdk-1.11", additionalInstrumentationName);
@@ -29,8 +31,8 @@ public boolean isHelperClass(String className) {
   }
 
   @Override
-  public boolean isIndyModule() {
-    return false;
+  public String getModuleGroup() {
+    return "aws-sdk";
   }
 
   @Override
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 d5ba3d2c5add..89a4a6c8f673 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,10 +10,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 java.util.List;
 
 @AutoService(InstrumentationModule.class)
-public class AwsSdkInstrumentationModule extends InstrumentationModule {
+public class AwsSdkInstrumentationModule extends InstrumentationModule
+    implements ExperimentalInstrumentationModule {
   public AwsSdkInstrumentationModule() {
     super("aws-sdk", "aws-sdk-1.11", "aws-sdk-1.11-core");
   }
@@ -24,8 +26,8 @@ public boolean isHelperClass(String className) {
   }
 
   @Override
-  public boolean isIndyModule() {
-    return false;
+  public String getModuleGroup() {
+    return "aws-sdk";
   }
 
   @Override