open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use namedOneOf instead of named(..).or(named(..)) (#8366)

This commit is contained in:
Lauri Tulmin 2023-04-26 10:26:52 +03:00 committed by GitHub
parent 1f5139280f
commit 354ba91ea8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
instrumentation/azure-core/azure-core-1.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/azurecore/v1_14/AzureSdkInstrumentationModule.java
View File

@ -7,7 +7,7 @@ package io.opentelemetry.javaagent.instrumentation.azurecore.v1_14;
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed; import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
import static java.util.Arrays.asList; import static java.util.Arrays.asList;
import static net.bytebuddy.matcher.ElementMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.namedOneOf;
import static net.bytebuddy.matcher.ElementMatchers.not; import static net.bytebuddy.matcher.ElementMatchers.not;
import com.google.auto.service.AutoService; import com.google.auto.service.AutoService;
@ -51,8 +51,9 @@ public class AzureSdkInstrumentationModule extends InstrumentationModule {
public static class EmptyTypeInstrumentation implements TypeInstrumentation { public static class EmptyTypeInstrumentation implements TypeInstrumentation {
@Override @Override
public ElementMatcher<TypeDescription> typeMatcher() { public ElementMatcher<TypeDescription> typeMatcher() {
return named("com.azure.core.http.policy.AfterRetryPolicyProvider") return namedOneOf(
.or(named("com.azure.core.util.tracing.Tracer")); "com.azure.core.http.policy.AfterRetryPolicyProvider",
"com.azure.core.util.tracing.Tracer");
} }
@Override @Override

7
instrumentation/azure-core/azure-core-1.19/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/azurecore/v1_19/AzureSdkInstrumentationModule.java
View File

@ -7,7 +7,7 @@ package io.opentelemetry.javaagent.instrumentation.azurecore.v1_19;
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed; import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
import static java.util.Arrays.asList; import static java.util.Arrays.asList;
import static net.bytebuddy.matcher.ElementMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.namedOneOf;
import static net.bytebuddy.matcher.ElementMatchers.not; import static net.bytebuddy.matcher.ElementMatchers.not;
import com.google.auto.service.AutoService; import com.google.auto.service.AutoService;
@ -51,8 +51,9 @@ public class AzureSdkInstrumentationModule extends InstrumentationModule {
public static class EmptyTypeInstrumentation implements TypeInstrumentation { public static class EmptyTypeInstrumentation implements TypeInstrumentation {
@Override @Override
public ElementMatcher<TypeDescription> typeMatcher() { public ElementMatcher<TypeDescription> typeMatcher() {
return named("com.azure.core.http.policy.AfterRetryPolicyProvider") return namedOneOf(
.or(named("com.azure.core.util.tracing.Tracer")); "com.azure.core.http.policy.AfterRetryPolicyProvider",
"com.azure.core.util.tracing.Tracer");
} }
@Override @Override

3
instrumentation/internal/internal-reflection/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/reflection/ReflectionInstrumentation.java
View File

@ -9,6 +9,7 @@ import static net.bytebuddy.matcher.ElementMatchers.isMethod;
import static net.bytebuddy.matcher.ElementMatchers.isPublic; import static net.bytebuddy.matcher.ElementMatchers.isPublic;
import static net.bytebuddy.matcher.ElementMatchers.isStatic; import static net.bytebuddy.matcher.ElementMatchers.isStatic;
import static net.bytebuddy.matcher.ElementMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.named;
import static net.bytebuddy.matcher.ElementMatchers.namedOneOf;
import static net.bytebuddy.matcher.ElementMatchers.takesArgument; import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
import static net.bytebuddy.matcher.ElementMatchers.takesArguments; import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
@ -24,7 +25,7 @@ public class ReflectionInstrumentation implements TypeInstrumentation {
@Override @Override
public ElementMatcher<TypeDescription> typeMatcher() { public ElementMatcher<TypeDescription> typeMatcher() {
return named("jdk.internal.reflect.Reflection").or(named("sun.reflect.Reflection")); return namedOneOf("jdk.internal.reflect.Reflection", "sun.reflect.Reflection");
} }
@Override @Override

3
instrumentation/restlet/restlet-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/restlet/v2_0/RouteInstrumentation.java
View File

@ -10,6 +10,7 @@ import static io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge.currentCo
import static io.opentelemetry.javaagent.instrumentation.restlet.v2_0.RestletSingletons.serverSpanName; import static io.opentelemetry.javaagent.instrumentation.restlet.v2_0.RestletSingletons.serverSpanName;
import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.isMethod;
import static net.bytebuddy.matcher.ElementMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.named;
import static net.bytebuddy.matcher.ElementMatchers.namedOneOf;
import static net.bytebuddy.matcher.ElementMatchers.takesArgument; import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
import io.opentelemetry.instrumentation.api.instrumenter.http.HttpRouteHolder; import io.opentelemetry.instrumentation.api.instrumenter.http.HttpRouteHolder;
@ -24,7 +25,7 @@ import org.restlet.routing.TemplateRoute;
public class RouteInstrumentation implements TypeInstrumentation { public class RouteInstrumentation implements TypeInstrumentation {
@Override @Override
public ElementMatcher<TypeDescription> typeMatcher() { public ElementMatcher<TypeDescription> typeMatcher() {
return named("org.restlet.routing.TemplateRoute").or(named("org.restlet.routing.Route")); return namedOneOf("org.restlet.routing.TemplateRoute", "org.restlet.routing.Route");
} }
@Override @Override

6
instrumentation/vertx/vertx-http-client/vertx-http-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/client/ConnectionManagerInstrumentation.java
View File

@ -6,6 +6,7 @@
package io.opentelemetry.javaagent.instrumentation.vertx.v4_0.client; package io.opentelemetry.javaagent.instrumentation.vertx.v4_0.client;
import static net.bytebuddy.matcher.ElementMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.named;
import static net.bytebuddy.matcher.ElementMatchers.namedOneOf;
import static net.bytebuddy.matcher.ElementMatchers.takesArgument; import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
@ -20,8 +21,9 @@ public class ConnectionManagerInstrumentation implements TypeInstrumentation {
@Override @Override
public ElementMatcher<TypeDescription> typeMatcher() { public ElementMatcher<TypeDescription> typeMatcher() {
return named("io.vertx.core.net.impl.clientconnection.ConnectionManager") // 4.0.0 return namedOneOf(
.or(named("io.vertx.core.net.impl.pool.ConnectionManager")); // 4.1.0 "io.vertx.core.net.impl.clientconnection.ConnectionManager", // 4.0.0
"io.vertx.core.net.impl.pool.ConnectionManager"); // 4.1.0
} }
@Override @Override