Extract library instrumentation for AWS SDK v1 #2525
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
anuraaga
requested review from
iNikem,
jkwatson,
mateuszrzeszutek,
pavolloffay,
trask and
tylerbenson
as code owners
anuraaga
commented
Mar 8, 2021
| tracer().endExceptionally(scope.getContext(), throwable); | ||
| scope.closeScope(); | ||
| } | ||
| if (throwable instanceof Exception) { |
There was a problem hiding this comment.
There is a small regression in my desire to delegate the actual tracing to the library instrumentation - Error will result in unclosed traces (but not uncleaned threadlocal). I feel this should be rare enough to live with until we get a report of problems.
…nstrumentation into aws-sdk-v1-library
mateuszrzeszutek
approved these changes
Mar 9, 2021
…nstrumentation into aws-sdk-v1-library
…nstrumentation into aws-sdk-v1-library
…y-java-instrumentation into aws-sdk-v1-library
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.
The tricky part of this was that our instrumentation also applied bytecode fixes to work around buggy behavior in the AWS SDK v1 itself related to exceptions, in particular making sure that we are able to close an active scope even with exceptions. This is not possible in library instrumentation, but we also don't really need to activate the scope in it because apache http client won't be automatically instrumented / need suppression. So I've basically split the request handler into two, agent one that delegates to library instrumentation but also creates a scope for use in the agent.
Fixes #2502