Skip to content

fix(aws-lambda): force placeholder resource so the Lambda Extension drops dd-tracer-serverless-span #11313

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
gh-worker-dd-mergequeue-cf854d merged 4 commits into from
May 12, 2026
Merged

fix(aws-lambda): force placeholder resource so the Lambda Extension drops dd-tracer-serverless-span #11313

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cf17024
fix(aws-lambda): force placeholder resource so the Lambda Extension d…
zarirhamza May 7, 2026
4adbfdc
use tag interceptor priority to avoid clobbering user-set resource names
rithikanarayan May 11, 2026
9d82898
Add unit test
rithikanarayan May 11, 2026
f07b5b0
comment
rithikanarayan May 11, 2026
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
16 changes: 16 additions & 0 deletions ...c/main/java/datadog/trace/instrumentation/aws/v1/lambda/LambdaHandlerInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import datadog.trace.bootstrap.instrumentation.api.AgentSpanContext;
import datadog.trace.bootstrap.instrumentation.api.AgentTracer;
import datadog.trace.bootstrap.instrumentation.api.InternalSpanTypes;
import datadog.trace.bootstrap.instrumentation.api.ResourceNamePriorities;
import datadog.trace.config.inversion.ConfigHelper;
import net.bytebuddy.asm.Advice;
import net.bytebuddy.description.type.TypeDescription;
Expand Down Expand Up @@ -126,6 +127,21 @@ static void exit(
String lambdaRequestId = awsContext.getAwsRequestId();

AgentTracer.get().notifyAppSecEnd(span);
// Force the resource name back to the literal placeholder marker right
// before finish so that the Datadog Lambda Extension's filter
// (filter_span_from_lambda_library_or_runtime in
// bottlecap/src/traces/trace_processor.rs, which compares
// span.resource == "dd-tracer-serverless-span") drops the placeholder.
// Other instrumentation (HTTP/JAX-RS) may have overwritten it with the
// route ("POST /") during the invocation, in which case the extension
// would fail to dedup, leading to the placeholder leaking to the backend
// with parent_id=0 and detaching the inferred apigateway root from the
// rest of the trace.
// Use MANUAL_INSTRUMENTATION priority because DDSpanContext.setResourceName
// ignores writes whose priority is below the current resource priority,
// and the HTTP/JAX-RS instrumentation will already have written
// HTTP_FRAMEWORK_ROUTE (3) by this point.
span.setResourceName(INVOCATION_SPAN_NAME, ResourceNamePriorities.MANUAL_INSTRUMENTATION);
Comment thread
rithikanarayan marked this conversation as resolved.
Outdated
span.finish();
AgentTracer.get().notifyExtensionEnd(span, result, null != throwable, lambdaRequestId);
} finally {
Expand Down
Loading