Clarify annotation instrumentation method matching#18836
Open
trask wants to merge 1 commit into
Open
Conversation
trask
commented
May 22, 2026
Comment on lines
-126
to
+114
| .hasTotalAttributeCount(0))); | ||
| .hasAttributesSatisfyingExactly( | ||
| equalTo(stringKey("methodAttribute"), "method")))); |
Contributor
There was a problem hiding this comment.
Pull request overview
Clarifies how the javaagent’s annotation-based instrumentations select join points by ensuring only true methods (not constructors) are matched for @WithSpan and @AddingSpanAttributes, aligning behavior with the now-documented constructor-annotation handling.
Changes:
- Restrict
@WithSpanand@AddingSpanAttributesmatching toisMethod()to avoid constructor matching. - Simplify advice application by relying on the method-only matcher (removing redundant
.and(isMethod())at application sites). - Update
AddingSpanAttributesInstrumentationTestto assert constructor annotations are ignored and to validate the expected attribute is added.
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| instrumentation/opentelemetry-instrumentation-annotations-1.16/javaagent/src/test/java/io/opentelemetry/test/annotation/AddingSpanAttributesInstrumentationTest.java | Updates the test to validate constructor annotations are ignored and asserts the expected method attribute behavior. |
| instrumentation/opentelemetry-instrumentation-annotations-1.16/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationannotations/v1_16/WithSpanInstrumentation.java | Narrows the annotation matcher to methods only and removes redundant method filtering when applying advice. |
| instrumentation/opentelemetry-instrumentation-annotations-1.16/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationannotations/v1_16/AddingSpanAttributesInstrumentation.java | Narrows the annotation matcher to methods only to prevent constructor advice application. |
jaydeluca
approved these changes
May 22, 2026
laurit
approved these changes
May 25, 2026
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
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 confusing implementation around constructor annotations, now that #13941 has documented current behavior.