Xray parenting fix #179
Merged
Xray parenting fix #179
Conversation
This file contains 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
maxday
reviewed
Sep 21, 2021
| @@ -493,3 +495,53 @@ def test_function_with_trigger_tags(self): | |||
| self.assertEqual( | |||
| span.get_tag("function_trigger.event_source"), "cloudwatch-logs" | |||
| ) | |||
|
|
|||
|
|
|||
| class TestSetTraceRootSpan(unittest.TestCase): | |||
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What does this PR do?
Adjusts x-ray/dd-trace parenting rules, so that when merging is turned on and a dd-trace context is in the incomming message, the dd-trace trace-id is used, and the x-ray parent-id is used.
Motivation
Fixes the flamegraph, so we can have dd-trace -> x-ray(eg apigateway) -> dd-trace parenting relationships.
Testing Guidelines
I've added a unit test, and tested this manually. Integration tests weren't useful because we mask trace-ids.
Additional Notes
Types of Changes
Check all that apply