make aws-sdk indy-ready (#14812)

Author: SylvainJuge

instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/AbstractAwsSdkInstrumentationModule.java

@@ -47,6 +47,11 @@ public List<TypeInstrumentation> typeInstrumentations() {
     return singletonList(new ResourceInjectingTypeInstrumentation());
   }
 
+  @Override
+  public boolean isIndyReady() {
+    return true;
+  }
+
   abstract void doTransform(TypeTransformer transformer);
 
   // A type instrumentation is needed to trigger resource injection.

instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/AwsSdkInstrumentationModule.java

@@ -30,6 +30,11 @@ public String getModuleGroup() {
     return "aws-sdk";
   }
 
+  @Override
+  public boolean isIndyReady() {
+    return true;
+  }
+
   @Override
   public List<TypeInstrumentation> typeInstrumentations() {
     return asList(

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

@@ -46,6 +46,11 @@ public List<TypeInstrumentation> typeInstrumentations() {
     return singletonList(new ResourceInjectingTypeInstrumentation());
   }
 
+  @Override
+  public boolean isIndyReady() {
+    return true;
+  }
+
   abstract void doTransform(TypeTransformer transformer);
 
   // A type instrumentation is needed to trigger resource injection.

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

@@ -12,6 +12,7 @@
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
 import java.util.concurrent.CompletableFuture;
 import net.bytebuddy.asm.Advice;
+import net.bytebuddy.asm.Advice.AssignReturned;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
 
@@ -35,10 +36,12 @@ public void transform(TypeTransformer transformer) {
   @SuppressWarnings("unused")
   public static class WrapFutureAdvice {
 
+    @AssignReturned.ToReturned
     @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void methodExit(@Advice.Return(readOnly = false) CompletableFuture<?> future) {
+    public static CompletableFuture<?> methodExit(@Advice.Return CompletableFuture<?> future) {
+
       // propagate context into CompletableFuture returned from aws async client methods
-      future = CompletableFutureWrapper.wrap(future);
+      return CompletableFutureWrapper.wrap(future);
     }
   }
 }

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

@@ -10,6 +10,7 @@
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
 import net.bytebuddy.asm.Advice;
+import net.bytebuddy.asm.Advice.AssignReturned;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
 import software.amazon.awssdk.services.bedrockruntime.BedrockRuntimeAsyncClient;
@@ -31,10 +32,11 @@ public void transform(TypeTransformer transformer) {
   @SuppressWarnings("unused")
   public static class BuildClientAdvice {
 
+    @AssignReturned.ToReturned
     @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void methodExit(
-        @Advice.Return(readOnly = false) BedrockRuntimeAsyncClient client) {
-      client = AwsSdkSingletons.telemetry().wrapBedrockRuntimeClient(client);
+    public static BedrockRuntimeAsyncClient methodExit(
+        @Advice.Return BedrockRuntimeAsyncClient client) {
+      return AwsSdkSingletons.telemetry().wrapBedrockRuntimeClient(client);
     }
   }
 }

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

@@ -10,6 +10,7 @@
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
 import net.bytebuddy.asm.Advice;
+import net.bytebuddy.asm.Advice.AssignReturned;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
 import software.amazon.awssdk.services.sqs.SqsAsyncClient;
@@ -30,9 +31,10 @@ public void transform(TypeTransformer transformer) {
   @SuppressWarnings("unused")
   public static class BuildClientAdvice {
 
+    @AssignReturned.ToReturned
     @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void methodExit(@Advice.Return(readOnly = false) SqsAsyncClient sqsClient) {
-      sqsClient = AwsSdkSingletons.telemetry().wrap(sqsClient);
+    public static SqsAsyncClient methodExit(@Advice.Return SqsAsyncClient sqsClient) {
+      return AwsSdkSingletons.telemetry().wrap(sqsClient);
     }
   }
 }

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

@@ -10,6 +10,7 @@
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
 import net.bytebuddy.asm.Advice;
+import net.bytebuddy.asm.Advice.AssignReturned;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
 import software.amazon.awssdk.services.sqs.SqsClient;
@@ -30,9 +31,10 @@ public void transform(TypeTransformer transformer) {
   @SuppressWarnings("unused")
   public static class BuildClientAdvice {
 
+    @AssignReturned.ToReturned
     @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void methodExit(@Advice.Return(readOnly = false) SqsClient sqsClient) {
-      sqsClient = AwsSdkSingletons.telemetry().wrap(sqsClient);
+    public static SqsClient methodExit(@Advice.Return SqsClient sqsClient) {
+      return AwsSdkSingletons.telemetry().wrap(sqsClient);
     }
   }
 }