From 82f6b698df7fc6ba074fdc863815a1e9272412d6 Mon Sep 17 00:00:00 2001 From: otelbot <197425009+otelbot@users.noreply.github.com> Date: Sun, 26 Apr 2026 02:35:37 +0000 Subject: [PATCH 1/4] Review fixes for avaje-jex-3.0:javaagent Automated code review of instrumentation/avaje-jex-3.0/javaagent. --- .../instrumentation/avaje/jex/v3_0/JexInstrumentationModule.java | 1 - 1 file changed, 1 deletion(-) diff --git a/instrumentation/avaje-jex-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/avaje/jex/v3_0/JexInstrumentationModule.java b/instrumentation/avaje-jex-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/avaje/jex/v3_0/JexInstrumentationModule.java index 037f5d0b3caa..699f5f6cc774 100644 --- a/instrumentation/avaje-jex-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/avaje/jex/v3_0/JexInstrumentationModule.java +++ b/instrumentation/avaje-jex-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/avaje/jex/v3_0/JexInstrumentationModule.java @@ -12,7 +12,6 @@ import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; import java.util.List; -@SuppressWarnings("unused") @AutoService(InstrumentationModule.class) public class JexInstrumentationModule extends InstrumentationModule { From 82dbb9b3e72560de4cf6a10b9e7fad9b500d0870 Mon Sep 17 00:00:00 2001 From: otelbot <197425009+otelbot@users.noreply.github.com> Date: Sun, 26 Apr 2026 02:40:26 +0000 Subject: [PATCH 2/4] Review fixes for aws-lambda-core-1.0:javaagent Automated code review of instrumentation/aws-lambda/aws-lambda-core-1.0/javaagent. --- .../v1_0/AwsLambdaInstrumentationModule.java | 12 ++++-------- .../v1_0/AwsLambdaStreamHandlerTest.java | 2 +- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/instrumentation/aws-lambda/aws-lambda-core-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awslambdacore/v1_0/AwsLambdaInstrumentationModule.java b/instrumentation/aws-lambda/aws-lambda-core-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awslambdacore/v1_0/AwsLambdaInstrumentationModule.java index 8ed351e7d0bf..26b8f4cce6ec 100644 --- a/instrumentation/aws-lambda/aws-lambda-core-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awslambdacore/v1_0/AwsLambdaInstrumentationModule.java +++ b/instrumentation/aws-lambda/aws-lambda-core-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awslambdacore/v1_0/AwsLambdaInstrumentationModule.java @@ -24,14 +24,10 @@ public AwsLambdaInstrumentationModule() { @Override public ElementMatcher.Junction classLoaderMatcher() { - return hasClassesNamed( - // added in 1.0.0 - "com.amazonaws.services.lambda.runtime.RequestHandler") - .and( - not( - hasClassesNamed( - // added in 2.2.0 (in which case aws-lambda-events-2.2 is used) - "com.amazonaws.services.lambda.runtime.events.SQSEvent"))); + // added in 1.0.0 + return hasClassesNamed("com.amazonaws.services.lambda.runtime.RequestHandler") + // added in 2.2.0 (in which case aws-lambda-events-2.2 is used) + .and(not(hasClassesNamed("com.amazonaws.services.lambda.runtime.events.SQSEvent"))); } @Override diff --git a/instrumentation/aws-lambda/aws-lambda-core-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/awslambdacore/v1_0/AwsLambdaStreamHandlerTest.java b/instrumentation/aws-lambda/aws-lambda-core-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/awslambdacore/v1_0/AwsLambdaStreamHandlerTest.java index 12e48f4e92c6..30538b1ff5ab 100644 --- a/instrumentation/aws-lambda/aws-lambda-core-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/awslambdacore/v1_0/AwsLambdaStreamHandlerTest.java +++ b/instrumentation/aws-lambda/aws-lambda-core-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/awslambdacore/v1_0/AwsLambdaStreamHandlerTest.java @@ -55,7 +55,7 @@ void tearDown() { } @Test - void handlerTraced() throws Exception { + void handlerTraced() throws IOException { InputStream input = new ByteArrayInputStream("hello\n".getBytes(UTF_8)); OutputStream output = new ByteArrayOutputStream(); RequestStreamHandlerTestImpl handler = new RequestStreamHandlerTestImpl(); From 329a2612b318c19ea273fea689523f44f84ba983 Mon Sep 17 00:00:00 2001 From: otelbot <197425009+otelbot@users.noreply.github.com> Date: Sun, 26 Apr 2026 02:46:37 +0000 Subject: [PATCH 3/4] Review fixes for aws-lambda-core-1.0:library Automated code review of instrumentation/aws-lambda/aws-lambda-core-1.0/library. --- .../awslambdacore/v1_0/internal/WrapperConfiguration.java | 4 ++-- .../v1_0/AwsLambdaStreamWrapperHttpPropagationTest.java | 2 +- .../awslambdacore/v1_0/AwsLambdaStreamWrapperTest.java | 2 +- instrumentation/aws-lambda/aws-lambda-core-1.0/metadata.yaml | 1 + 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/internal/WrapperConfiguration.java b/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/internal/WrapperConfiguration.java index adb0ed7d2b0a..91c6b314871f 100644 --- a/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/internal/WrapperConfiguration.java +++ b/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/internal/WrapperConfiguration.java @@ -13,8 +13,6 @@ */ public final class WrapperConfiguration { - private WrapperConfiguration() {} - public static final String OTEL_LAMBDA_FLUSH_TIMEOUT_ENV_KEY = "OTEL_INSTRUMENTATION_AWS_LAMBDA_FLUSH_TIMEOUT"; public static final Duration OTEL_LAMBDA_FLUSH_TIMEOUT_DEFAULT = Duration.ofSeconds(10); @@ -30,4 +28,6 @@ public static Duration flushTimeout() { } return OTEL_LAMBDA_FLUSH_TIMEOUT_DEFAULT; } + + private WrapperConfiguration() {} } diff --git a/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AwsLambdaStreamWrapperHttpPropagationTest.java b/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AwsLambdaStreamWrapperHttpPropagationTest.java index 5d85ff69543b..a43a180d68f6 100644 --- a/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AwsLambdaStreamWrapperHttpPropagationTest.java +++ b/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AwsLambdaStreamWrapperHttpPropagationTest.java @@ -66,7 +66,7 @@ void tearDown() { } @Test - void handlerTraced() throws Exception { + void handlerTraced() throws IOException { String content = "{" + "\"headers\" : {" diff --git a/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AwsLambdaStreamWrapperTest.java b/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AwsLambdaStreamWrapperTest.java index d3f3d2c652dd..08b024f38441 100644 --- a/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AwsLambdaStreamWrapperTest.java +++ b/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AwsLambdaStreamWrapperTest.java @@ -65,7 +65,7 @@ void tearDown() { } @Test - void handlerTraced() throws Exception { + void handlerTraced() throws IOException { InputStream input = new ByteArrayInputStream("hello\n".getBytes(UTF_8)); OutputStream output = new ByteArrayOutputStream(); diff --git a/instrumentation/aws-lambda/aws-lambda-core-1.0/metadata.yaml b/instrumentation/aws-lambda/aws-lambda-core-1.0/metadata.yaml index d880cc0041ad..ed3f1c178fd9 100644 --- a/instrumentation/aws-lambda/aws-lambda-core-1.0/metadata.yaml +++ b/instrumentation/aws-lambda/aws-lambda-core-1.0/metadata.yaml @@ -14,6 +14,7 @@ semantic_conventions: library_link: https://docs.aws.amazon.com/lambda/latest/dg/java-handler.html configurations: - name: otel.instrumentation.aws-lambda.flush-timeout + declarative_name: java.aws_lambda.flush_timeout type: int default: 10000 description: Flush timeout in milliseconds. From 48ab511b51dc5fbae531f7b957c95ed91a9e4ee5 Mon Sep 17 00:00:00 2001 From: otelbot <197425009+otelbot@users.noreply.github.com> Date: Sun, 26 Apr 2026 02:52:17 +0000 Subject: [PATCH 4/4] Review fixes for aws-lambda-events-2.2:javaagent Automated code review of instrumentation/aws-lambda/aws-lambda-events-2.2/javaagent. --- .../v2_2/AwsLambdaRequestHandlerInstrumentation.java | 8 ++++---- .../awslambdaevents/v2_2/AwsLambdaStreamHandlerTest.java | 2 +- .../aws-lambda/aws-lambda-events-2.2/metadata.yaml | 2 ++ 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/instrumentation/aws-lambda/aws-lambda-events-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awslambdaevents/v2_2/AwsLambdaRequestHandlerInstrumentation.java b/instrumentation/aws-lambda/aws-lambda-events-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awslambdaevents/v2_2/AwsLambdaRequestHandlerInstrumentation.java index d75bf87f22db..709de70aa2a8 100644 --- a/instrumentation/aws-lambda/aws-lambda-events-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awslambdaevents/v2_2/AwsLambdaRequestHandlerInstrumentation.java +++ b/instrumentation/aws-lambda/aws-lambda-events-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awslambdaevents/v2_2/AwsLambdaRequestHandlerInstrumentation.java @@ -59,15 +59,15 @@ public static class AdviceScope { private final AwsLambdaRequest lambdaRequest; private final Scope functionScope; private final io.opentelemetry.context.Context functionContext; - private final Scope messageScope; - private final io.opentelemetry.context.Context messageContext; + @Nullable private final Scope messageScope; + @Nullable private final io.opentelemetry.context.Context messageContext; private AdviceScope( AwsLambdaRequest lambdaRequest, io.opentelemetry.context.Context functionContext, Scope functionScope, - io.opentelemetry.context.Context messageContext, - Scope messageScope) { + @Nullable io.opentelemetry.context.Context messageContext, + @Nullable Scope messageScope) { this.lambdaRequest = lambdaRequest; this.functionContext = functionContext; this.functionScope = functionScope; diff --git a/instrumentation/aws-lambda/aws-lambda-events-2.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/awslambdaevents/v2_2/AwsLambdaStreamHandlerTest.java b/instrumentation/aws-lambda/aws-lambda-events-2.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/awslambdaevents/v2_2/AwsLambdaStreamHandlerTest.java index 57091a08f8c5..b85399522146 100644 --- a/instrumentation/aws-lambda/aws-lambda-events-2.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/awslambdaevents/v2_2/AwsLambdaStreamHandlerTest.java +++ b/instrumentation/aws-lambda/aws-lambda-events-2.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/awslambdaevents/v2_2/AwsLambdaStreamHandlerTest.java @@ -55,7 +55,7 @@ void tearDown() { } @Test - void handlerTraced() throws Exception { + void handlerTraced() throws IOException { InputStream input = new ByteArrayInputStream("hello\n".getBytes(UTF_8)); OutputStream output = new ByteArrayOutputStream(); RequestStreamHandlerTestImpl handler = new RequestStreamHandlerTestImpl(); diff --git a/instrumentation/aws-lambda/aws-lambda-events-2.2/metadata.yaml b/instrumentation/aws-lambda/aws-lambda-events-2.2/metadata.yaml index 47416f96f5d0..6c3c9b720989 100644 --- a/instrumentation/aws-lambda/aws-lambda-events-2.2/metadata.yaml +++ b/instrumentation/aws-lambda/aws-lambda-events-2.2/metadata.yaml @@ -9,10 +9,12 @@ semantic_conventions: library_link: https://docs.aws.amazon.com/lambda/latest/dg/java-handler.html configurations: - name: otel.instrumentation.aws-lambda.flush-timeout + declarative_name: java.aws_lambda.flush_timeout type: int default: 10000 description: Flush timeout in milliseconds. - name: otel.instrumentation.http.known-methods + declarative_name: java.common.http.known_methods description: > Configures the instrumentation to recognize an alternative set of HTTP request methods. All other methods will be treated as `_OTHER`.