diff --git a/instrumentation/akka-http-10.0/src/main/java/io/opentelemetry/auto/instrumentation/akkahttp/AkkaHttpClientInstrumentation.java b/instrumentation/akka-http-10.0/src/main/java/io/opentelemetry/auto/instrumentation/akkahttp/AkkaHttpClientInstrumentation.java index 7701959455..1bbfc1bb0f 100644 --- a/instrumentation/akka-http-10.0/src/main/java/io/opentelemetry/auto/instrumentation/akkahttp/AkkaHttpClientInstrumentation.java +++ b/instrumentation/akka-http-10.0/src/main/java/io/opentelemetry/auto/instrumentation/akkahttp/AkkaHttpClientInstrumentation.java @@ -96,7 +96,7 @@ public final class AkkaHttpClientInstrumentation extends Instrumenter.Default { @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void methodExit( - @Advice.Argument(value = 0) final HttpRequest request, + @Advice.Argument(0) final HttpRequest request, @Advice.This final HttpExt thiz, @Advice.Return final Future responseFuture, @Advice.Enter final SpanWithScope spanWithScope, diff --git a/instrumentation/akka-http-10.0/src/main/java/io/opentelemetry/auto/instrumentation/akkahttp/AkkaHttpServerInstrumentation.java b/instrumentation/akka-http-10.0/src/main/java/io/opentelemetry/auto/instrumentation/akkahttp/AkkaHttpServerInstrumentation.java index 957f98634b..96feab0061 100644 --- a/instrumentation/akka-http-10.0/src/main/java/io/opentelemetry/auto/instrumentation/akkahttp/AkkaHttpServerInstrumentation.java +++ b/instrumentation/akka-http-10.0/src/main/java/io/opentelemetry/auto/instrumentation/akkahttp/AkkaHttpServerInstrumentation.java @@ -89,7 +89,7 @@ public final class AkkaHttpServerInstrumentation extends Instrumenter.Default { public static void wrapHandler( @Advice.Argument(value = 0, readOnly = false) Function1> handler, - @Advice.Argument(value = 7) final Materializer materializer) { + @Advice.Argument(7) final Materializer materializer) { handler = new AsyncWrapper(handler, materializer.executionContext()); } } diff --git a/instrumentation/apache-httpasyncclient-4.0/src/main/java/io/opentelemetry/auto/instrumentation/apachehttpasyncclient/ApacheHttpClientRedirectInstrumentation.java b/instrumentation/apache-httpasyncclient-4.0/src/main/java/io/opentelemetry/auto/instrumentation/apachehttpasyncclient/ApacheHttpClientRedirectInstrumentation.java index 688d9d5fb2..270051faf4 100644 --- a/instrumentation/apache-httpasyncclient-4.0/src/main/java/io/opentelemetry/auto/instrumentation/apachehttpasyncclient/ApacheHttpClientRedirectInstrumentation.java +++ b/instrumentation/apache-httpasyncclient-4.0/src/main/java/io/opentelemetry/auto/instrumentation/apachehttpasyncclient/ApacheHttpClientRedirectInstrumentation.java @@ -46,7 +46,7 @@ public class ApacheHttpClientRedirectInstrumentation extends Instrumenter.Defaul public static class ClientRedirectAdvice { @Advice.OnMethodExit(suppress = Throwable.class) private static void onAfterExecute( - @Advice.Argument(value = 0) final HttpRequest original, + @Advice.Argument(0) final HttpRequest original, @Advice.Return(typing = Assigner.Typing.DYNAMIC) final HttpRequest redirect) { if (redirect == null) { return; diff --git a/instrumentation/aws-java-sdk-2.2/src/main/java/io/opentelemetry/auto/instrumentation/aws/v2/AwsHttpClientInstrumentation.java b/instrumentation/aws-java-sdk-2.2/src/main/java/io/opentelemetry/auto/instrumentation/aws/v2/AwsHttpClientInstrumentation.java index 047161e9f3..c74ccad569 100644 --- a/instrumentation/aws-java-sdk-2.2/src/main/java/io/opentelemetry/auto/instrumentation/aws/v2/AwsHttpClientInstrumentation.java +++ b/instrumentation/aws-java-sdk-2.2/src/main/java/io/opentelemetry/auto/instrumentation/aws/v2/AwsHttpClientInstrumentation.java @@ -2,6 +2,7 @@ package io.opentelemetry.auto.instrumentation.aws.v2; import static io.opentelemetry.auto.instrumentation.aws.v2.TracingExecutionInterceptor.ScopeHolder.CURRENT; import static io.opentelemetry.auto.tooling.ByteBuddyElementMatchers.safeHasSuperType; +import static java.util.Collections.singletonMap; import static net.bytebuddy.matcher.ElementMatchers.isInterface; import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.isPublic; @@ -11,7 +12,6 @@ import static net.bytebuddy.matcher.ElementMatchers.not; import com.google.auto.service.AutoService; import io.opentelemetry.auto.tooling.Instrumenter; import io.opentelemetry.context.Scope; -import java.util.Collections; import java.util.Map; import net.bytebuddy.asm.Advice; import net.bytebuddy.description.method.MethodDescription; @@ -38,7 +38,7 @@ public final class AwsHttpClientInstrumentation extends AbstractAwsClientInstrum @Override public Map, String> transformers() { - return Collections.singletonMap( + return singletonMap( isMethod().and(isPublic()).and(named("execute")), AwsHttpClientInstrumentation.class.getName() + "$AwsHttpClientAdvice"); } diff --git a/instrumentation/couchbase-2.6/src/main/java/io/opentelemetry/auto/instrumentation/couchbase/client/CouchbaseCoreInstrumentation.java b/instrumentation/couchbase-2.6/src/main/java/io/opentelemetry/auto/instrumentation/couchbase/client/CouchbaseCoreInstrumentation.java index 45587be44b..843673dc45 100644 --- a/instrumentation/couchbase-2.6/src/main/java/io/opentelemetry/auto/instrumentation/couchbase/client/CouchbaseCoreInstrumentation.java +++ b/instrumentation/couchbase-2.6/src/main/java/io/opentelemetry/auto/instrumentation/couchbase/client/CouchbaseCoreInstrumentation.java @@ -14,7 +14,6 @@ import io.opentelemetry.auto.bootstrap.InstrumentationContext; import io.opentelemetry.auto.tooling.Instrumenter; import io.opentelemetry.trace.Span; import io.opentelemetry.trace.Tracer; -import java.util.Collections; import java.util.Map; import net.bytebuddy.asm.Advice; import net.bytebuddy.description.method.MethodDescription; @@ -35,8 +34,7 @@ public class CouchbaseCoreInstrumentation extends Instrumenter.Default { @Override public Map contextStore() { - return Collections.singletonMap( - "com.couchbase.client.core.message.CouchbaseRequest", Span.class.getName()); + return singletonMap("com.couchbase.client.core.message.CouchbaseRequest", Span.class.getName()); } @Override diff --git a/instrumentation/couchbase-2.6/src/main/java/io/opentelemetry/auto/instrumentation/couchbase/client/CouchbaseNetworkInstrumentation.java b/instrumentation/couchbase-2.6/src/main/java/io/opentelemetry/auto/instrumentation/couchbase/client/CouchbaseNetworkInstrumentation.java index 8c2188d0c8..eefce694a5 100644 --- a/instrumentation/couchbase-2.6/src/main/java/io/opentelemetry/auto/instrumentation/couchbase/client/CouchbaseNetworkInstrumentation.java +++ b/instrumentation/couchbase-2.6/src/main/java/io/opentelemetry/auto/instrumentation/couchbase/client/CouchbaseNetworkInstrumentation.java @@ -15,7 +15,6 @@ import io.opentelemetry.auto.bootstrap.InstrumentationContext; import io.opentelemetry.auto.instrumentation.api.Tags; import io.opentelemetry.auto.tooling.Instrumenter; import io.opentelemetry.trace.Span; -import java.util.Collections; import java.util.Map; import net.bytebuddy.asm.Advice; import net.bytebuddy.description.method.MethodDescription; @@ -36,8 +35,7 @@ public class CouchbaseNetworkInstrumentation extends Instrumenter.Default { @Override public Map contextStore() { - return Collections.singletonMap( - "com.couchbase.client.core.message.CouchbaseRequest", Span.class.getName()); + return singletonMap("com.couchbase.client.core.message.CouchbaseRequest", Span.class.getName()); } @Override diff --git a/instrumentation/google-http-client-1.19/src/main/java/io/opentelemetry/auto/instrumentation/googlehttpclient/GoogleHttpClientInstrumentation.java b/instrumentation/google-http-client-1.19/src/main/java/io/opentelemetry/auto/instrumentation/googlehttpclient/GoogleHttpClientInstrumentation.java index 3a624da2c2..9a93afbd0f 100644 --- a/instrumentation/google-http-client-1.19/src/main/java/io/opentelemetry/auto/instrumentation/googlehttpclient/GoogleHttpClientInstrumentation.java +++ b/instrumentation/google-http-client-1.19/src/main/java/io/opentelemetry/auto/instrumentation/googlehttpclient/GoogleHttpClientInstrumentation.java @@ -4,6 +4,7 @@ import static io.opentelemetry.auto.instrumentation.googlehttpclient.GoogleHttpC import static io.opentelemetry.auto.instrumentation.googlehttpclient.GoogleHttpClientDecorator.TRACER; import static io.opentelemetry.auto.instrumentation.googlehttpclient.HeadersInjectAdapter.SETTER; import static io.opentelemetry.trace.Span.Kind.CLIENT; +import static java.util.Collections.singletonMap; import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.isPublic; import static net.bytebuddy.matcher.ElementMatchers.named; @@ -20,7 +21,6 @@ import io.opentelemetry.auto.tooling.Instrumenter; import io.opentelemetry.context.Scope; import io.opentelemetry.trace.Span; import io.opentelemetry.trace.Status; -import java.util.Collections; import java.util.HashMap; import java.util.Map; import net.bytebuddy.asm.Advice; @@ -42,8 +42,7 @@ public class GoogleHttpClientInstrumentation extends Instrumenter.Default { @Override public Map contextStore() { - return Collections.singletonMap( - "com.google.api.client.http.HttpRequest", RequestState.class.getName()); + return singletonMap("com.google.api.client.http.HttpRequest", RequestState.class.getName()); } @Override diff --git a/instrumentation/hibernate/core-4.3/src/main/java/io/opentelemetry/auto/instrumentation/hibernate/core/v4_3/SessionInstrumentation.java b/instrumentation/hibernate/core-4.3/src/main/java/io/opentelemetry/auto/instrumentation/hibernate/core/v4_3/SessionInstrumentation.java index 40369125a8..35db06fb97 100644 --- a/instrumentation/hibernate/core-4.3/src/main/java/io/opentelemetry/auto/instrumentation/hibernate/core/v4_3/SessionInstrumentation.java +++ b/instrumentation/hibernate/core-4.3/src/main/java/io/opentelemetry/auto/instrumentation/hibernate/core/v4_3/SessionInstrumentation.java @@ -1,6 +1,7 @@ package io.opentelemetry.auto.instrumentation.hibernate.core.v4_3; import static io.opentelemetry.auto.tooling.ByteBuddyElementMatchers.safeHasSuperType; +import static java.util.Collections.singletonMap; import static net.bytebuddy.matcher.ElementMatchers.isInterface; import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.named; @@ -57,13 +58,9 @@ public class SessionInstrumentation extends Instrumenter.Default { @Override public Map, String> transformers() { - final Map, String> transformers = new HashMap<>(); - - transformers.put( + return singletonMap( isMethod().and(returns(safeHasSuperType(named("org.hibernate.procedure.ProcedureCall")))), SessionInstrumentation.class.getName() + "$GetProcedureCallAdvice"); - - return transformers; } public static class GetProcedureCallAdvice { diff --git a/instrumentation/java-concurrent/src/main/java/io/opentelemetry/auto/instrumentation/java/concurrent/AkkaExecutorInstrumentation.java b/instrumentation/java-concurrent/src/main/java/io/opentelemetry/auto/instrumentation/java/concurrent/AkkaExecutorInstrumentation.java index bbb9654aa4..bdc52d3a1f 100644 --- a/instrumentation/java-concurrent/src/main/java/io/opentelemetry/auto/instrumentation/java/concurrent/AkkaExecutorInstrumentation.java +++ b/instrumentation/java-concurrent/src/main/java/io/opentelemetry/auto/instrumentation/java/concurrent/AkkaExecutorInstrumentation.java @@ -1,6 +1,7 @@ package io.opentelemetry.auto.instrumentation.java.concurrent; import static io.opentelemetry.auto.instrumentation.java.concurrent.AdviceUtils.TRACER; +import static java.util.Collections.singletonMap; import static net.bytebuddy.matcher.ElementMatchers.nameMatches; import static net.bytebuddy.matcher.ElementMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.takesArgument; @@ -12,7 +13,6 @@ import io.opentelemetry.auto.bootstrap.InstrumentationContext; import io.opentelemetry.auto.bootstrap.instrumentation.java.concurrent.State; import io.opentelemetry.auto.tooling.Instrumenter; import io.opentelemetry.trace.Span; -import java.util.Collections; import java.util.HashMap; import java.util.Map; import java.util.concurrent.Executor; @@ -38,8 +38,7 @@ public final class AkkaExecutorInstrumentation extends AbstractExecutorInstrumen @Override public Map contextStore() { - return Collections.singletonMap( - AkkaForkJoinTaskInstrumentation.TASK_CLASS_NAME, State.class.getName()); + return singletonMap(AkkaForkJoinTaskInstrumentation.TASK_CLASS_NAME, State.class.getName()); } @Override diff --git a/instrumentation/java-concurrent/src/main/java/io/opentelemetry/auto/instrumentation/java/concurrent/JavaForkJoinTaskInstrumentation.java b/instrumentation/java-concurrent/src/main/java/io/opentelemetry/auto/instrumentation/java/concurrent/JavaForkJoinTaskInstrumentation.java index 2d57ab87d5..5e5fcde1b8 100644 --- a/instrumentation/java-concurrent/src/main/java/io/opentelemetry/auto/instrumentation/java/concurrent/JavaForkJoinTaskInstrumentation.java +++ b/instrumentation/java-concurrent/src/main/java/io/opentelemetry/auto/instrumentation/java/concurrent/JavaForkJoinTaskInstrumentation.java @@ -1,6 +1,7 @@ package io.opentelemetry.auto.instrumentation.java.concurrent; import static io.opentelemetry.auto.tooling.ByteBuddyElementMatchers.safeHasSuperType; +import static java.util.Collections.singletonMap; import static net.bytebuddy.matcher.ElementMatchers.isAbstract; import static net.bytebuddy.matcher.ElementMatchers.isInterface; import static net.bytebuddy.matcher.ElementMatchers.named; @@ -62,11 +63,9 @@ public final class JavaForkJoinTaskInstrumentation extends Instrumenter.Default @Override public Map, String> transformers() { - final Map, String> transformers = new HashMap<>(); - transformers.put( + return singletonMap( named("exec").and(takesArguments(0)).and(not(isAbstract())), JavaForkJoinTaskInstrumentation.class.getName() + "$ForkJoinTaskAdvice"); - return transformers; } public static class ForkJoinTaskAdvice { diff --git a/instrumentation/java-concurrent/src/main/java/io/opentelemetry/auto/instrumentation/java/concurrent/ScalaExecutorInstrumentation.java b/instrumentation/java-concurrent/src/main/java/io/opentelemetry/auto/instrumentation/java/concurrent/ScalaExecutorInstrumentation.java index ba6bea6802..822ecb4c6f 100644 --- a/instrumentation/java-concurrent/src/main/java/io/opentelemetry/auto/instrumentation/java/concurrent/ScalaExecutorInstrumentation.java +++ b/instrumentation/java-concurrent/src/main/java/io/opentelemetry/auto/instrumentation/java/concurrent/ScalaExecutorInstrumentation.java @@ -1,6 +1,7 @@ package io.opentelemetry.auto.instrumentation.java.concurrent; import static io.opentelemetry.auto.instrumentation.java.concurrent.AdviceUtils.TRACER; +import static java.util.Collections.singletonMap; import static net.bytebuddy.matcher.ElementMatchers.nameMatches; import static net.bytebuddy.matcher.ElementMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.takesArgument; @@ -11,7 +12,6 @@ import io.opentelemetry.auto.bootstrap.InstrumentationContext; import io.opentelemetry.auto.bootstrap.instrumentation.java.concurrent.State; import io.opentelemetry.auto.tooling.Instrumenter; import io.opentelemetry.trace.Span; -import java.util.Collections; import java.util.HashMap; import java.util.Map; import java.util.concurrent.Executor; @@ -38,8 +38,7 @@ public final class ScalaExecutorInstrumentation extends AbstractExecutorInstrume @Override public Map contextStore() { - return Collections.singletonMap( - ScalaForkJoinTaskInstrumentation.TASK_CLASS_NAME, State.class.getName()); + return singletonMap(ScalaForkJoinTaskInstrumentation.TASK_CLASS_NAME, State.class.getName()); } @Override diff --git a/instrumentation/java-concurrent/src/main/java/io/opentelemetry/auto/instrumentation/java/concurrent/ScalaForkJoinTaskInstrumentation.java b/instrumentation/java-concurrent/src/main/java/io/opentelemetry/auto/instrumentation/java/concurrent/ScalaForkJoinTaskInstrumentation.java index 4bb15acef4..d2c8c7ebc3 100644 --- a/instrumentation/java-concurrent/src/main/java/io/opentelemetry/auto/instrumentation/java/concurrent/ScalaForkJoinTaskInstrumentation.java +++ b/instrumentation/java-concurrent/src/main/java/io/opentelemetry/auto/instrumentation/java/concurrent/ScalaForkJoinTaskInstrumentation.java @@ -1,6 +1,7 @@ package io.opentelemetry.auto.instrumentation.java.concurrent; import static io.opentelemetry.auto.tooling.ByteBuddyElementMatchers.safeHasSuperType; +import static java.util.Collections.singletonMap; import static net.bytebuddy.matcher.ElementMatchers.isAbstract; import static net.bytebuddy.matcher.ElementMatchers.isInterface; import static net.bytebuddy.matcher.ElementMatchers.named; @@ -64,11 +65,9 @@ public final class ScalaForkJoinTaskInstrumentation extends Instrumenter.Default @Override public Map, String> transformers() { - final Map, String> transformers = new HashMap<>(); - transformers.put( + return singletonMap( named("exec").and(takesArguments(0)).and(not(isAbstract())), ScalaForkJoinTaskInstrumentation.class.getName() + "$ForkJoinTaskAdvice"); - return transformers; } public static class ForkJoinTaskAdvice { diff --git a/instrumentation/jax-rs-annotations-2.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/JaxRsAsyncResponseInstrumentation.java b/instrumentation/jax-rs-annotations-2.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/JaxRsAsyncResponseInstrumentation.java index aacd37c3dd..e539b6df7b 100644 --- a/instrumentation/jax-rs-annotations-2.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/JaxRsAsyncResponseInstrumentation.java +++ b/instrumentation/jax-rs-annotations-2.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/JaxRsAsyncResponseInstrumentation.java @@ -2,6 +2,7 @@ package io.opentelemetry.auto.instrumentation.jaxrs2; import static io.opentelemetry.auto.instrumentation.jaxrs2.JaxRsAnnotationsDecorator.DECORATE; import static io.opentelemetry.auto.tooling.ByteBuddyElementMatchers.safeHasSuperType; +import static java.util.Collections.singletonMap; import static net.bytebuddy.matcher.ElementMatchers.isPublic; import static net.bytebuddy.matcher.ElementMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.takesArgument; @@ -11,7 +12,6 @@ import io.opentelemetry.auto.bootstrap.ContextStore; import io.opentelemetry.auto.bootstrap.InstrumentationContext; import io.opentelemetry.auto.tooling.Instrumenter; import io.opentelemetry.trace.Span; -import java.util.Collections; import java.util.HashMap; import java.util.Map; import javax.ws.rs.container.AsyncResponse; @@ -29,7 +29,7 @@ public final class JaxRsAsyncResponseInstrumentation extends Instrumenter.Defaul @Override public Map contextStore() { - return Collections.singletonMap("javax.ws.rs.container.AsyncResponse", Span.class.getName()); + return singletonMap("javax.ws.rs.container.AsyncResponse", Span.class.getName()); } @Override diff --git a/instrumentation/jax-rs-client-1.1/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs/v1/JaxRsClientV1Instrumentation.java b/instrumentation/jax-rs-client-1.1/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs/v1/JaxRsClientV1Instrumentation.java index e65f0ebbe6..eb3a971cd5 100644 --- a/instrumentation/jax-rs-client-1.1/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs/v1/JaxRsClientV1Instrumentation.java +++ b/instrumentation/jax-rs-client-1.1/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs/v1/JaxRsClientV1Instrumentation.java @@ -62,8 +62,7 @@ public final class JaxRsClientV1Instrumentation extends Instrumenter.Default { @Advice.OnMethodEnter public static SpanWithScope onEnter( - @Advice.Argument(value = 0) final ClientRequest request, - @Advice.This final ClientHandler thisObj) { + @Advice.Argument(0) final ClientRequest request, @Advice.This final ClientHandler thisObj) { // WARNING: this might be a chain...so we only have to trace the first in the chain. final boolean isRootClientHandler = null == request.getProperties().get(SPAN_ATTRIBUTE); diff --git a/instrumentation/rmi/src/main/java/io/opentelemetry/auto/instrumentation/rmi/context/client/RmiClientContextInstrumentation.java b/instrumentation/rmi/src/main/java/io/opentelemetry/auto/instrumentation/rmi/context/client/RmiClientContextInstrumentation.java index ea2fd74324..b6cc548918 100644 --- a/instrumentation/rmi/src/main/java/io/opentelemetry/auto/instrumentation/rmi/context/client/RmiClientContextInstrumentation.java +++ b/instrumentation/rmi/src/main/java/io/opentelemetry/auto/instrumentation/rmi/context/client/RmiClientContextInstrumentation.java @@ -84,8 +84,7 @@ public class RmiClientContextInstrumentation extends Instrumenter.Default { public static class StreamRemoteCallConstructorAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) public static void onEnter( - @Advice.Argument(value = 0) final Connection c, - @Advice.Argument(value = 1) final ObjID id) { + @Advice.Argument(0) final Connection c, @Advice.Argument(1) final ObjID id) { if (!c.isReusable()) { return; } diff --git a/instrumentation/spring-data-1.8/src/main/java/io/opentelemetry/auto/instrumentation/springdata/SpringRepositoryInstrumentation.java b/instrumentation/spring-data-1.8/src/main/java/io/opentelemetry/auto/instrumentation/springdata/SpringRepositoryInstrumentation.java index decf545a2e..61d206d791 100644 --- a/instrumentation/spring-data-1.8/src/main/java/io/opentelemetry/auto/instrumentation/springdata/SpringRepositoryInstrumentation.java +++ b/instrumentation/spring-data-1.8/src/main/java/io/opentelemetry/auto/instrumentation/springdata/SpringRepositoryInstrumentation.java @@ -4,6 +4,7 @@ package io.opentelemetry.auto.instrumentation.springdata; import static io.opentelemetry.auto.instrumentation.springdata.SpringDataDecorator.DECORATOR; import static io.opentelemetry.auto.instrumentation.springdata.SpringDataDecorator.TRACER; +import static java.util.Collections.singletonMap; import static net.bytebuddy.matcher.ElementMatchers.isConstructor; import static net.bytebuddy.matcher.ElementMatchers.isInterface; import static net.bytebuddy.matcher.ElementMatchers.named; @@ -14,7 +15,6 @@ import io.opentelemetry.auto.tooling.Instrumenter; import io.opentelemetry.context.Scope; import io.opentelemetry.trace.Span; import java.lang.reflect.Method; -import java.util.Collections; import java.util.Map; import net.bytebuddy.asm.Advice; import net.bytebuddy.description.method.MethodDescription; @@ -54,7 +54,7 @@ public final class SpringRepositoryInstrumentation extends Instrumenter.Default @Override public Map, String> transformers() { - return Collections.singletonMap( + return singletonMap( isConstructor(), SpringRepositoryInstrumentation.class.getName() + "$RepositoryFactorySupportAdvice"); } diff --git a/instrumentation/trace-annotation/src/main/java/io/opentelemetry/auto/instrumentation/trace_annotation/TraceAnnotationsInstrumentation.java b/instrumentation/trace-annotation/src/main/java/io/opentelemetry/auto/instrumentation/trace_annotation/TraceAnnotationsInstrumentation.java index 3957bdbc02..aa9faf9f63 100644 --- a/instrumentation/trace-annotation/src/main/java/io/opentelemetry/auto/instrumentation/trace_annotation/TraceAnnotationsInstrumentation.java +++ b/instrumentation/trace-annotation/src/main/java/io/opentelemetry/auto/instrumentation/trace_annotation/TraceAnnotationsInstrumentation.java @@ -2,6 +2,7 @@ package io.opentelemetry.auto.instrumentation.trace_annotation; import static io.opentelemetry.auto.instrumentation.trace_annotation.TraceConfigInstrumentation.PACKAGE_CLASS_NAME_REGEX; import static io.opentelemetry.auto.tooling.ByteBuddyElementMatchers.safeHasSuperType; +import static java.util.Collections.singletonMap; import static net.bytebuddy.matcher.ElementMatchers.declaresMethod; import static net.bytebuddy.matcher.ElementMatchers.isAnnotatedWith; import static net.bytebuddy.matcher.ElementMatchers.named; @@ -97,7 +98,6 @@ public final class TraceAnnotationsInstrumentation extends Instrumenter.Default @Override public Map, String> transformers() { - return Collections.singletonMap( - isAnnotatedWith(methodTraceMatcher), packageName + ".TraceAdvice"); + return singletonMap(isAnnotatedWith(methodTraceMatcher), packageName + ".TraceAdvice"); } }