Support Trace Context extraction from Lambda Context object, and respect user-configured OTEL_PROPAGATORS #1191
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ect user-configured OTEL_PROPAGATORS
|
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #1191 +/- ##
=============================================
- Coverage 85.71% 67.07% -18.64%
- Complexity 19 525 +506
=============================================
Files 3 54 +51
Lines 49 2694 +2645
Branches 5 376 +371
=============================================
+ Hits 42 1807 +1765
- Misses 3 750 +747
- Partials 4 137 +133 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
wangzlei
approved these changes
Sep 19, 2025
jj22ee
added a commit
that referenced
this pull request
Sep 24, 2025
…Muzzle Check (#1218) *Issue #, if available:* - https://github.com/aws-observability/aws-otel-java-instrumentation/actions/runs/17954879038/job/51066448865 AWS Lambda Environment may or may not have the `getXrayTraceId` method in Lambda Context (from Lambda Core dependency). This will cause OTel's Muzzle Check to disable the AWS Lambda Instrumentation in the event that it isn't present, causing no Lambda Function Handler Span to appear Fix of previous PR: #1191 *Description of changes:* - Use `@NoMuzzle` annotation when accessing `getXrayTraceId` in Lambda Context Object, which avoids OTel's muzzle check. If `NoSuchMethodError` is caught, we do not try this logic again. - Add unit test for when `getXrayTraceId` throws `NoSuchMethodError`. By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
jj22ee
added a commit
that referenced
this pull request
Oct 24, 2025
…ect user-configured OTEL_PROPAGATORS (#1191) *Issue #, if available:* - In latest `com.amazonaws:aws-lambda-java-core:1.4.0`, Lambda Context has a new `lambdaContext.getXrayTraceId()` method. We need to use this over SystemProperty/EnvVar to support multi-concurrency in Lambda. *Description of changes:* - respect OTEL_PROPAGATORS Env Var priority - Priority logic BEFORE: - Create `carrierA` to contain headers from Lambda request http headers and the custom client context - get X-Ray Trace ID from (in order or priority) SystemProperty or EnvVar, add it to new `carrierB` - Use Global Propagator to extract trace context from `carrierB` (trace extraction only works if xray propagator is configured) - If above trace extraction results in a context that is not valid&sampled, try again with Global Propagator using `carrierA` - Priority logic AFTER: - Create `carrierA` to contain headers from Lambda request http headers and the custom client context - get X-Ray Trace ID from (in order or priority) Lambda Context, SystemProperty, or EnvVar, add it to `carrierA` (will overwrite x-ray header value if present from Lambda request http headers). - Use Global Propagator to extract trace context from `carrierA` By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
jj22ee
added a commit
that referenced
this pull request
Oct 24, 2025
…Muzzle Check (#1218) *Issue #, if available:* - https://github.com/aws-observability/aws-otel-java-instrumentation/actions/runs/17954879038/job/51066448865 AWS Lambda Environment may or may not have the `getXrayTraceId` method in Lambda Context (from Lambda Core dependency). This will cause OTel's Muzzle Check to disable the AWS Lambda Instrumentation in the event that it isn't present, causing no Lambda Function Handler Span to appear Fix of previous PR: #1191 *Description of changes:* - Use `@NoMuzzle` annotation when accessing `getXrayTraceId` in Lambda Context Object, which avoids OTel's muzzle check. If `NoSuchMethodError` is caught, we do not try this logic again. - Add unit test for when `getXrayTraceId` throws `NoSuchMethodError`. By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
jj22ee
added a commit
that referenced
this pull request
Oct 27, 2025
…ect user-configured OTEL_PROPAGATORS (#1191) *Issue #, if available:* - In latest `com.amazonaws:aws-lambda-java-core:1.4.0`, Lambda Context has a new `lambdaContext.getXrayTraceId()` method. We need to use this over SystemProperty/EnvVar to support multi-concurrency in Lambda. *Description of changes:* - respect OTEL_PROPAGATORS Env Var priority - Priority logic BEFORE: - Create `carrierA` to contain headers from Lambda request http headers and the custom client context - get X-Ray Trace ID from (in order or priority) SystemProperty or EnvVar, add it to new `carrierB` - Use Global Propagator to extract trace context from `carrierB` (trace extraction only works if xray propagator is configured) - If above trace extraction results in a context that is not valid&sampled, try again with Global Propagator using `carrierA` - Priority logic AFTER: - Create `carrierA` to contain headers from Lambda request http headers and the custom client context - get X-Ray Trace ID from (in order or priority) Lambda Context, SystemProperty, or EnvVar, add it to `carrierA` (will overwrite x-ray header value if present from Lambda request http headers). - Use Global Propagator to extract trace context from `carrierA` By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
jj22ee
added a commit
that referenced
this pull request
Oct 27, 2025
…Muzzle Check (#1218) *Issue #, if available:* - https://github.com/aws-observability/aws-otel-java-instrumentation/actions/runs/17954879038/job/51066448865 AWS Lambda Environment may or may not have the `getXrayTraceId` method in Lambda Context (from Lambda Core dependency). This will cause OTel's Muzzle Check to disable the AWS Lambda Instrumentation in the event that it isn't present, causing no Lambda Function Handler Span to appear Fix of previous PR: #1191 *Description of changes:* - Use `@NoMuzzle` annotation when accessing `getXrayTraceId` in Lambda Context Object, which avoids OTel's muzzle check. If `NoSuchMethodError` is caught, we do not try this logic again. - Add unit test for when `getXrayTraceId` throws `NoSuchMethodError`. By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
jj22ee
added a commit
that referenced
this pull request
Oct 27, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Issue #, if available:
com.amazonaws:aws-lambda-java-core:1.4.0, Lambda Context has a newlambdaContext.getXrayTraceId()method. We need to use this over SystemProperty/EnvVar to support multi-concurrency in Lambda.Description of changes:
carrierAto contain headers from Lambda request http headers and the custom client contextcarrierBcarrierB(trace extraction only works if xray propagator is configured)carrierAcarrierAto contain headers from Lambda request http headers and the custom client contextcarrierA(will overwrite x-ray header value if present from Lambda request http headers).carrierABy submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.