Fix parent source as being set as Xray, when trace merging disabled #60
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
…trace merging was disabled
agocs
reviewed
May 14, 2020
| @@ -234,7 +234,7 @@ def set_dd_trace_py_root(trace_context, merge_xray_traces): | |||
|
|
|||
|
|
|||
| def create_function_execution_span( | |||
| context, function_name, is_cold_start, trace_context | |||
| context, function_name, is_cold_start, trace_context, merge_xray_traces | |||
There was a problem hiding this comment.
Don't you need to change the signature where this method is called as well?
There was a problem hiding this comment.
Whoops, good catch. Looks like I had a file I didn't stage into the commit. Should be updated
agocs
approved these changes
May 14, 2020
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?
Currently, the layer will set a metadata field on the root dd-trace span called '_dd.parent_source' to 'xray' even when x-ray merging is disabled. That field is used by the trace forwarder to filter out spans, to reduce duplication between x-ray and dd-trace traces. This PR fixes that issue, so that when x-ray trace merging is disabled, the field remains unset, and the root span is never filtered out.
Motivation
What inspired you to submit this pull request?
Testing Guidelines
How did you test this pull request?
Additional Notes
Anything else we should know when reviewing?
Checklist