Skip to content

[Bugfix] Duplicate lambda spans in Java 11 #1011

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
Feb 3, 2025
Merged

[Bugfix] Duplicate lambda spans in Java 11 #1011

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
18 changes: 18 additions & 0 deletions lambda-layer/patches/opentelemetry-java-instrumentation.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -729,3 +729,21 @@ index 94a85244e2..25a32896aa 100644
@Test
void handlerTraced() {
String result = handler().handleRequest("hello", context);
diff --git a/instrumentation/aws-lambda/aws-lambda-core-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awslambdacore/v1_0/AwsLambdaRequestHandlerInstrumentation.java b/instrumentation/aws-lambda/aws-lambda-core-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awslambdacore/v1_0/AwsLambdaRequestHandlerInstrumentation.java
index 0743cdea75..dfc70b368f 100644
--- a/instrumentation/aws-lambda/aws-lambda-core-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awslambdacore/v1_0/AwsLambdaRequestHandlerInstrumentation.java
+++ b/instrumentation/aws-lambda/aws-lambda-core-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awslambdacore/v1_0/AwsLambdaRequestHandlerInstrumentation.java
@@ -38,7 +38,12 @@ public class AwsLambdaRequestHandlerInstrumentation implements TypeInstrumentati
@Override
public ElementMatcher<TypeDescription> typeMatcher() {
return implementsInterface(named("com.amazonaws.services.lambda.runtime.RequestHandler"))
- .and(not(nameStartsWith("com.amazonaws.services.lambda.runtime.api.client")));
+ .and(not(nameStartsWith("com.amazonaws.services.lambda.runtime.api.client")))
+ // In Java 8 and Java 11 runtimes,
+ // AWS Lambda runtime is packaged under `lambdainternal` package.
+ // But it is `com.amazonaws.services.lambda.runtime.api.client`
+ // for new runtime likes Java 17 and Java 21.
+ .and(not(nameStartsWith("lambdainternal")));
}

@Override
Loading