Add logic for stripping the AWS.SDK prefix for Local Root spans #127
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
- Previous change to strip the prefix in other cases open-telemetry@7c037ad
thpierce
approved these changes
Oct 19, 2023
| @@ -155,7 +155,11 @@ func MakeDependencySubsegmentForLocalRootDependencySpan(span ptrace.Span, resour | |||
| } | |||
|
|
|||
| if myAwsRemoteService, ok := span.Attributes().Get(awsRemoteService); ok { | |||
There was a problem hiding this comment.
Not blocking: Would have been good to break this out into a helper to reduce code duplication.
There was a problem hiding this comment.
Updated with de-duped logic
thpierce
approved these changes
Oct 19, 2023
harrryr
approved these changes
Oct 20, 2023
lisguo
approved these changes
Oct 20, 2023
JayPolanco
approved these changes
Oct 20, 2023
lisguo
merged commit 8bdf732
into
amazon-contributing:aws-cwa-dev
77 of 87 checks passed
lisguo
pushed a commit
to lisguo/opentelemetry-collector-contrib
that referenced
this pull request
Oct 20, 2023
…on-contributing#127) * 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
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 <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: Adding logic to strip AWS.SDK from local root dependency spans. This had been done previously for other spans, but there was a missed codepath related to local root naming.
Link to tracking Issue: None
Testing: Added a unit test
Documentation: None