Fix potential issue with apache-httpclient call-depth tracking#5110
Merged
Conversation
We only reset the call-depth when we're finishing an HTTP span, so we must only increment it when we know we'll create and activate an HTTP span. Previously it was possible the call-depth would be incremented, but an HTTP span might then not be created if the request came from the AWS SDK.
mcculls
added
inst: others
BenchmarksParameters
See matching parameters
SummaryFound 0 performance improvements and 0 performance regressions! Performance is the same for 22 cases. See unchanged results
|
PerfectSlayer
approved these changes
Apr 25, 2023
PerfectSlayer
left a comment
PerfectSlayer
left a comment
Contributor
There was a problem hiding this comment.
Only a minor struction question. Otherwise LGTM 👍
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
What Does This Do
We only reset the call-depth when we're finishing an HTTP span, so we must only increment it when we know we'll create and activate an HTTP span.
Motivation
Previously it was possible the call-depth would be incremented, but an HTTP span might then not be created if the request came from the AWS SDK.
Additional Notes
Workaround when using versions of the tracer without this fix - either add this JVM option:
or set this environment variable: