Skip to content

make aws-sdk indy-ready #14812

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 29, 2025
Merged

make aws-sdk indy-ready #14812

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions ...telemetry/javaagent/instrumentation/awssdk/v1_11/AbstractAwsSdkInstrumentationModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
5 changes: 5 additions & 0 deletions .../io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/AwsSdkInstrumentationModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@ public String getModuleGroup() {
return "aws-sdk";
}

@Override
public boolean isIndyReady() {
return true;
}

@Override
public List<TypeInstrumentation> typeInstrumentations() {
return asList(
Expand Down
5 changes: 5 additions & 0 deletions ...ntelemetry/javaagent/instrumentation/awssdk/v2_2/AbstractAwsSdkInstrumentationModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
7 changes: 5 additions & 2 deletions ...telemetry/javaagent/instrumentation/awssdk/v2_2/AwsAsyncClientHandlerInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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);
}
}
}
8 changes: 5 additions & 3 deletions ...t/instrumentation/awssdk/v2_2/DefaultBedrockRuntimeAsyncClientBuilderInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
}
}
}
6 changes: 4 additions & 2 deletions ...ry/javaagent/instrumentation/awssdk/v2_2/DefaultSqsAsyncClientBuilderInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
}
}
}
6 changes: 4 additions & 2 deletions ...lemetry/javaagent/instrumentation/awssdk/v2_2/DefaultSqsClientBuilderInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
}
}
}