Update segment conversion logic #115
Merged
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.
atshaw43
approved these changes
Oct 11, 2023
lisguo
approved these changes
Oct 11, 2023
SaxyPandaBear
approved these changes
Oct 12, 2023
| myAwsRemoteService, _ := span.Attributes().Get(awsRemoteService) | ||
|
|
||
| dependencySubsegment.Name = awsxray.String(myAwsRemoteService.Str()) | ||
| if myAwsRemoteService, ok := span.Attributes().Get(awsRemoteService); ok { |
There was a problem hiding this comment.
mild nit - it would be nice to add a negative test here so that we ensure that if we were to get a span without the AWS remote service set, it doesn't break and leaves the subsegment name as empty, but I don't know how much real value that provides if it's that unlikely.
lisguo
merged commit ee847de
into
amazon-contributing:aws-cwa-dev
67 of 78 checks passed
lisguo
pushed a commit
to lisguo/opentelemetry-collector-contrib
that referenced
this pull request
Oct 20, 2023
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.
andrzej-stencel
pushed a commit
to open-telemetry/opentelemetry-collector-contrib
that referenced
this pull request
May 22, 2024
**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 <[email protected]> Co-authored-by: Thomas Pierce <[email protected]> Co-authored-by: John Knollmeyer <[email protected]>
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:
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.
Link to tracking Issue: N/A, related to comments on #111
Testing: make succeeds
Documentation: N/A