aws-xray-propagator: ensure trace state is not overwritten #3774
+54
−1
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
|
|
majanjua-amzn
force-pushed
the
main
branch
6 times, most recently
from
35bf7b4 to
67c4eb1
Compare
majanjua-amzn
force-pushed
the
main
branch
2 times, most recently
from
a7a580a to
dfb5e15
Compare
jj22ee
reviewed
Sep 26, 2025
...r/opentelemetry-propagator-aws-xray/src/opentelemetry/propagators/aws/aws_xray_propagator.py
Outdated
Show resolved
Hide resolved
...r/opentelemetry-propagator-aws-xray/src/opentelemetry/propagators/aws/aws_xray_propagator.py
Show resolved
Hide resolved
xrmx
reviewed
Oct 13, 2025
Contributor
xrmx
left a comment
xrmx
left a comment
There was a problem hiding this comment.
@majanjua-amzn please setup pre-commit as written CONTRIBUTING.md to fix formatting
majanjua-amzn
force-pushed
the
main
branch
2 times, most recently
from
dfe2310 to
cd196cc
Compare
Author
|
@xrmx could we get some help running the workflows here and moving forward? Let me know if there's a better user/group to ping for help on this in the future, thanks |
tammy-baylis-swi
approved these changes
Nov 25, 2025
Contributor
tammy-baylis-swi
left a comment
tammy-baylis-swi
left a comment
There was a problem hiding this comment.
Thanks for this
Author
|
@tammy-baylis-swi could I get some help merging this as well? Thanks for the approval! |
Contributor
Np @majanjua-amzn ! I'm only an Approver so I can run workflows but it's up to Maintainers for final merge. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
Description
The problem: Currently, the AWS X-Ray propagator overrides the trace state when returning the context by providing the default
trace.TraceState()instead of attempting to retrieve this information from the provided context.The solution: Check for a valid trace state in the provided context and propagate it to the new context if it exists.
Type of change
Please delete options that are not relevant.
How Has This Been Tested?
Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration
Does This PR Require a Core Repo Change?
Checklist:
See contributing.md for styleguide, changelog guidelines, and more.