Skip to content

Commit 224aa7a

Browse files
fix classLoaderMatcher
1 parent d20d65b commit 224aa7a

File tree

1 file changed

+7
-4
lines changed
  • instrumentation/opentelemetry-instrumentation-annotations-1.16/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationannotations

1 file changed

+7
-4
lines changed

instrumentation/opentelemetry-instrumentation-annotations-1.16/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationannotations/AnnotationInstrumentationModule.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,17 @@
1010

1111
import application.io.opentelemetry.instrumentation.annotations.AddingSpanAttributes;
1212
import application.io.opentelemetry.instrumentation.annotations.WithSpan;
13+
import application.io.opentelemetry.instrumentation.annotations.Counted;
14+
import application.io.opentelemetry.instrumentation.annotations.Timed;
1315
import com.google.auto.service.AutoService;
1416
import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
1517
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
1618
import java.util.List;
1719
import net.bytebuddy.matcher.ElementMatcher;
1820

1921
/**
20-
* Instrumentation for methods annotated with {@link WithSpan} and {@link AddingSpanAttributes}
22+
* Instrumentation for methods annotated with {@link WithSpan} and {@link AddingSpanAttributes},
23+
* {@link Counted} or {@link Timed}
2124
* annotations.
2225
*/
2326
@AutoService(InstrumentationModule.class)
@@ -37,9 +40,9 @@ public int order() {
3740
@Override
3841
public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
3942
return hasClassesNamed(
40-
"application.io.opentelemetry.instrumentation.annotations.WithSpan",
41-
"application.io.opentelemetry.instrumentation.annotations.Counted",
42-
"application.io.opentelemetry.instrumentation.annotations.Timed");
43+
"application.io.opentelemetry.instrumentation.annotations.WithSpan")
44+
.or(hasClassesNamed("application.io.opentelemetry.instrumentation.annotations.Counted"))
45+
.or(hasClassesNamed("application.io.opentelemetry.instrumentation.annotations.Timed"));
4346
}
4447

4548
@Override

0 commit comments

Comments
 (0)