[exporter/awsxray] Adjust AwsXRay segment conversion logic #33000
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
In this commit, we are fixing a couple small bugs missed in the previous review. First, we are adding a nil-guard when settting dependencySubsegment.Name, to avoid the (unlikely, but possible) scenario where local root dependency spans are created without awsRemoteService. Second, we are updating the common logic for setting segment.Name, which previously only looked at CLIENT/PRODUCER spans, but now needs to look at CONSUMER spans.
* Add logic for stripping the AWS.SDK prefix for Local Root spans - Previous change to strip the prefix in other cases open-telemetry@7c037ad * De-duplicate identical logic
wangzlei
approved these changes
May 16, 2024
fatsheep9146
added
the
ready to merge
mxiamxia
approved these changes
May 21, 2024
cparkins
pushed a commit
to AmadeusITGroup/opentelemetry-collector-contrib
that referenced
this pull request
Jul 11, 2024
…metry#33000) **Description:** <Describe what has changed.> <!--Ex. Fixing a bug - Describe the bug and how this fixes the issue. Ex. Adding a feature - Explain what this achieves.--> Cherry-picking from downstream: amazon-contributing#111 amazon-contributing#115 amazon-contributing#127 - We are adjusting the segment creation to accommodate local root spans. If a span is a not a local root, then we keep existing behavior. If it is a local root then: - If it is an Internal or Server span, then promote it to a segment. Else we will split it into a segment and subsegment. The segment will represent the service operation and the subsegment will represent the dependency (service A calls service B). - Update the common logic for setting segment.Name, which previously only looked at CLIENT/PRODUCER spans, to also look at CONSUMER spans. **Link to tracking Issue:** <Issue number if applicable> **Testing:** <Describe what testing was performed and which tests were added.> Unit Testing **Documentation:** <Describe the documentation added.> --------- Co-authored-by: atshaw43 <108552302+atshaw43@users.noreply.github.com> Co-authored-by: Thomas Pierce <thp@amazon.com> Co-authored-by: John Knollmeyer <jaknollmeyer@gmail.com>
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.
Description:
Cherry-picking from downstream:
amazon-contributing#111
amazon-contributing#115
amazon-contributing#127
If a span is a not a local root, then we keep existing behavior.
If it is a local root then:
Else we will split it into a segment and subsegment. The segment will represent the service operation and the subsegment will represent the dependency (service A calls service B).
Link to tracking Issue:
Testing:
Unit Testing
Documentation: