Skip to content

Apply external annotation instrumentation only to methods #13948

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
May 29, 2025
Merged

Apply external annotation instrumentation only to methods #13948

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ...telemetry/javaagent/instrumentation/extannotations/ExternalAnnotationInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import static net.bytebuddy.matcher.ElementMatchers.declaresMethod;
import static net.bytebuddy.matcher.ElementMatchers.isAnnotatedWith;
import static net.bytebuddy.matcher.ElementMatchers.isDeclaredBy;
import static net.bytebuddy.matcher.ElementMatchers.isMethod;
import static net.bytebuddy.matcher.ElementMatchers.namedOneOf;
import static net.bytebuddy.matcher.ElementMatchers.none;
import static net.bytebuddy.matcher.ElementMatchers.not;
Expand Down Expand Up @@ -109,7 +110,7 @@ public ElementMatcher<TypeDescription> typeMatcher() {
@Override
public void transform(TypeTransformer transformer) {
transformer.applyAdviceToMethod(
isAnnotatedWith(traceAnnotationMatcher).and(not(excludedMethodsMatcher)),
isAnnotatedWith(traceAnnotationMatcher).and(not(excludedMethodsMatcher)).and(isMethod()),
ExternalAnnotationInstrumentation.class.getName() + "$ExternalAnnotationAdvice");
}

Expand Down
6 changes: 6 additions & 0 deletions ...c/test/java/io/opentelemetry/javaagent/instrumentation/extannotations/SayTracedHello.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@
@SuppressWarnings("UnnecessarilyFullyQualified")
public class SayTracedHello {

public SayTracedHello() {}

// used to verify that constructor with tracing annotation doesn't break instrumentation
@com.appoptics.api.ext.LogMethod
Copy link
Contributor Author

@laurit laurit May 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

most, if not all, of the other tracing annotations don't apply to constructors

public SayTracedHello(String unused) {}

@com.appoptics.api.ext.LogMethod
public String appoptics() {
Span.current().setAttribute("providerAttr", "AppOptics");
Expand Down
Loading