Fix scope leak in aws sdk instrumentation #13129
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
laurit
commented
Jan 30, 2025
| @@ -233,6 +231,25 @@ public SdkRequest modifyRequest( | |||
| return request; | |||
| } | |||
|
|
|||
| @Override | |||
| public void afterMarshalling( | |||
There was a problem hiding this comment.
As far as I know scope is used to suppress nested http client spans. It is possible that setting up the scope in some other (later) phase would also work.
breedx-splk
approved these changes
Jan 30, 2025
There was a problem hiding this comment.
Thanks for jumping on this so quickly, appreciate that! I think this approach makes sense -- we don't ever start a scope until the request has been marshaled, so we avoid this leak now.
I suppose one downside is that we can't even create an error span to let a user know that their request wasn't marshaled correctly. I think that's a reasonable compromise, and it seems to be aligned with the design of the AWS interceptors anyway.
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.
Resolves #13124
When exception is thrown during marshalling we end up leaking the scope. This PR moves opening the scope after marshalling as it was before #8405