Ensure that netty 4.0 instrumentation is not applied to 4.1 #4626
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
requested review from
anuraaga,
iNikem,
jkwatson,
mateuszrzeszutek,
pavolloffay,
trask and
tylerbenson
as code owners
laurit
commented
Nov 10, 2021
| named("doConnect").and(takesArgument(0, SocketAddress.class)), | ||
| named("doConnect") | ||
| .and(takesArgument(0, SocketAddress.class)) | ||
| .and(returns(named("io.netty.channel.ChannelFuture"))), |
There was a problem hiding this comment.
In netty 4.1 this method returns void
trask
reviewed
Nov 10, 2021
trask
approved these changes
Nov 11, 2021
Comment on lines
134
to
+154
| assertThat(references).containsKey("muzzle.TestClasses$MethodBodyAdvice$SomeImplementation"); | ||
| assertMethod( | ||
| references.get("muzzle.TestClasses$MethodBodyAdvice$SomeImplementation"), | ||
| "someMethod", | ||
| "()V", | ||
| PROTECTED_OR_HIGHER, | ||
| OwnershipFlag.NON_STATIC); | ||
| assertThat(references).containsKey("muzzle.TestClasses$MethodBodyAdvice$B"); | ||
| assertMethod( | ||
| references.get("muzzle.TestClasses$MethodBodyAdvice$B"), | ||
| "staticMethod", | ||
| "()V", | ||
| PROTECTED_OR_HIGHER, | ||
| OwnershipFlag.STATIC); | ||
| assertThat(references).containsKey("muzzle.TestClasses$MethodBodyAdvice$A"); | ||
| assertMethod( | ||
| references.get("muzzle.TestClasses$MethodBodyAdvice$A"), | ||
| "<init>", | ||
| "()V", | ||
| PROTECTED_OR_HIGHER, | ||
| OwnershipFlag.NON_STATIC); |
Comment on lines
+446
to
+450
| if (handle.getTag() == Opcodes.H_INVOKEVIRTUAL | ||
| || handle.getTag() == Opcodes.H_INVOKESTATIC | ||
| || handle.getTag() == Opcodes.H_INVOKESPECIAL | ||
| || handle.getTag() == Opcodes.H_NEWINVOKESPECIAL | ||
| || handle.getTag() == Opcodes.H_INVOKEINTERFACE) { |
RashmiRam
pushed a commit
to RashmiRam/opentelemetry-auto-instr-java
that referenced
this pull request
May 23, 2022
…emetry#4626) * Enusre that netty 4.0 instrumentation is not applied to 4.1 * formatting * cross test netty instrumentation
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.
Hopefully resolves #4612
Not completely sure how the linked issue happened, perhaps there are netty jars from different versions on the classpath, perhaps something else. This pr adds checking of method references to muzzle so that usages like
AttributeKey::newwould also be verified.