-
Notifications
You must be signed in to change notification settings - Fork 873
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix netty strict context checks #4002
Merged
trask
merged 3 commits into
open-telemetry:main
from
trask:fix-netty-strict-context-leaks
Aug 30, 2021
Merged
Fix netty strict context checks #4002
trask
merged 3 commits into
open-telemetry:main
from
trask:fix-netty-strict-context-leaks
Aug 30, 2021
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
trask
requested review from
anuraaga,
iNikem,
jkwatson,
laurit,
mateuszrzeszutek,
pavolloffay and
tylerbenson
as code owners
August 28, 2021 03:32
anuraaga
approved these changes
Aug 29, 2021
@@ -61,7 +61,15 @@ public void transform(TypeTransformer transformer) { | |||
public static void wrapListener( | |||
@Advice.Argument(value = 0, readOnly = false) | |||
GenericFutureListener<? extends Future<?>> listener) { | |||
listener = FutureListenerWrappers.wrap(Java8BytecodeBridge.currentContext(), listener); | |||
// wrapping our "end" listener leads to strict context leak failures since there will be an |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it's good to add the phrasing "We only want to wrap user callbacks"
// wrapping internal netty listeners also leads to strict context leak failures since some of | ||
// those are called after our "end" listener | ||
String listenerClassName = listener.getClass().getName(); | ||
if (!listenerClassName.startsWith("io.opentelemetry.javaagent.") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ClassValue? :)
mateuszrzeszutek
approved these changes
Aug 30, 2021
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.
most of the netty-4.0 changes were just syncing it with netty-4.1 in order to resolve one of its strict context checks (it was ending the span too early on the first http response chunk)