From 354ba91ea8d8028d4f88c280e7d482581752924f Mon Sep 17 00:00:00 2001 From: Lauri Tulmin Date: Wed, 26 Apr 2023 10:26:52 +0300 Subject: [PATCH] Use namedOneOf instead of named(..).or(named(..)) (#8366) --- .../azurecore/v1_14/AzureSdkInstrumentationModule.java | 7 ++++--- .../azurecore/v1_19/AzureSdkInstrumentationModule.java | 7 ++++--- .../internal/reflection/ReflectionInstrumentation.java | 3 ++- .../instrumentation/restlet/v2_0/RouteInstrumentation.java | 3 ++- .../v4_0/client/ConnectionManagerInstrumentation.java | 6 ++++-- 5 files changed, 16 insertions(+), 10 deletions(-) diff --git a/instrumentation/azure-core/azure-core-1.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/azurecore/v1_14/AzureSdkInstrumentationModule.java b/instrumentation/azure-core/azure-core-1.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/azurecore/v1_14/AzureSdkInstrumentationModule.java index 51f4db73d5..d9560a8b12 100644 --- a/instrumentation/azure-core/azure-core-1.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/azurecore/v1_14/AzureSdkInstrumentationModule.java +++ b/instrumentation/azure-core/azure-core-1.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/azurecore/v1_14/AzureSdkInstrumentationModule.java @@ -7,7 +7,7 @@ package io.opentelemetry.javaagent.instrumentation.azurecore.v1_14; import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed; 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 com.google.auto.service.AutoService; @@ -51,8 +51,9 @@ public class AzureSdkInstrumentationModule extends InstrumentationModule { public static class EmptyTypeInstrumentation implements TypeInstrumentation { @Override public ElementMatcher typeMatcher() { - return named("com.azure.core.http.policy.AfterRetryPolicyProvider") - .or(named("com.azure.core.util.tracing.Tracer")); + return namedOneOf( + "com.azure.core.http.policy.AfterRetryPolicyProvider", + "com.azure.core.util.tracing.Tracer"); } @Override diff --git a/instrumentation/azure-core/azure-core-1.19/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/azurecore/v1_19/AzureSdkInstrumentationModule.java b/instrumentation/azure-core/azure-core-1.19/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/azurecore/v1_19/AzureSdkInstrumentationModule.java index ef8be8e154..6bf1f14a68 100644 --- a/instrumentation/azure-core/azure-core-1.19/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/azurecore/v1_19/AzureSdkInstrumentationModule.java +++ b/instrumentation/azure-core/azure-core-1.19/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/azurecore/v1_19/AzureSdkInstrumentationModule.java @@ -7,7 +7,7 @@ package io.opentelemetry.javaagent.instrumentation.azurecore.v1_19; import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed; 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 com.google.auto.service.AutoService; @@ -51,8 +51,9 @@ public class AzureSdkInstrumentationModule extends InstrumentationModule { public static class EmptyTypeInstrumentation implements TypeInstrumentation { @Override public ElementMatcher typeMatcher() { - return named("com.azure.core.http.policy.AfterRetryPolicyProvider") - .or(named("com.azure.core.util.tracing.Tracer")); + return namedOneOf( + "com.azure.core.http.policy.AfterRetryPolicyProvider", + "com.azure.core.util.tracing.Tracer"); } @Override diff --git a/instrumentation/internal/internal-reflection/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/reflection/ReflectionInstrumentation.java b/instrumentation/internal/internal-reflection/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/reflection/ReflectionInstrumentation.java index c23a670182..472b61d524 100644 --- a/instrumentation/internal/internal-reflection/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/reflection/ReflectionInstrumentation.java +++ b/instrumentation/internal/internal-reflection/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/reflection/ReflectionInstrumentation.java @@ -9,6 +9,7 @@ import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.isPublic; import static net.bytebuddy.matcher.ElementMatchers.isStatic; 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.takesArguments; @@ -24,7 +25,7 @@ public class ReflectionInstrumentation implements TypeInstrumentation { @Override public ElementMatcher typeMatcher() { - return named("jdk.internal.reflect.Reflection").or(named("sun.reflect.Reflection")); + return namedOneOf("jdk.internal.reflect.Reflection", "sun.reflect.Reflection"); } @Override diff --git a/instrumentation/restlet/restlet-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/restlet/v2_0/RouteInstrumentation.java b/instrumentation/restlet/restlet-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/restlet/v2_0/RouteInstrumentation.java index 37ff574ac3..29b588710f 100644 --- a/instrumentation/restlet/restlet-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/restlet/v2_0/RouteInstrumentation.java +++ b/instrumentation/restlet/restlet-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/restlet/v2_0/RouteInstrumentation.java @@ -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 net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.named; +import static net.bytebuddy.matcher.ElementMatchers.namedOneOf; import static net.bytebuddy.matcher.ElementMatchers.takesArgument; import io.opentelemetry.instrumentation.api.instrumenter.http.HttpRouteHolder; @@ -24,7 +25,7 @@ import org.restlet.routing.TemplateRoute; public class RouteInstrumentation implements TypeInstrumentation { @Override public ElementMatcher typeMatcher() { - return named("org.restlet.routing.TemplateRoute").or(named("org.restlet.routing.Route")); + return namedOneOf("org.restlet.routing.TemplateRoute", "org.restlet.routing.Route"); } @Override diff --git a/instrumentation/vertx/vertx-http-client/vertx-http-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/client/ConnectionManagerInstrumentation.java b/instrumentation/vertx/vertx-http-client/vertx-http-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/client/ConnectionManagerInstrumentation.java index ecaf34449e..9b51318b2b 100644 --- a/instrumentation/vertx/vertx-http-client/vertx-http-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/client/ConnectionManagerInstrumentation.java +++ b/instrumentation/vertx/vertx-http-client/vertx-http-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/client/ConnectionManagerInstrumentation.java @@ -6,6 +6,7 @@ package io.opentelemetry.javaagent.instrumentation.vertx.v4_0.client; import static net.bytebuddy.matcher.ElementMatchers.named; +import static net.bytebuddy.matcher.ElementMatchers.namedOneOf; import static net.bytebuddy.matcher.ElementMatchers.takesArgument; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; @@ -20,8 +21,9 @@ public class ConnectionManagerInstrumentation implements TypeInstrumentation { @Override public ElementMatcher typeMatcher() { - return named("io.vertx.core.net.impl.clientconnection.ConnectionManager") // 4.0.0 - .or(named("io.vertx.core.net.impl.pool.ConnectionManager")); // 4.1.0 + return namedOneOf( + "io.vertx.core.net.impl.clientconnection.ConnectionManager", // 4.0.0 + "io.vertx.core.net.impl.pool.ConnectionManager"); // 4.1.0 } @Override