From c7e5d8b8b946c86d7538ee9b3cf3cf7c0aaae988 Mon Sep 17 00:00:00 2001 From: John Engelman Date: Thu, 14 Nov 2024 10:26:10 -0600 Subject: [PATCH] (chore) remove indy specific inlining per review --- .../ratpack/v1_7/DefaultExecControllerInstrumentation.java | 6 +++--- .../ratpack/v1_7/HttpClientInstrumentation.java | 2 +- .../ratpack/v1_7/RatpackInstrumentationModule.java | 5 ----- .../ratpack/v1_7/RequestActionSupportInstrumentation.java | 6 +++--- .../ratpack/v1_7/ServerRegistryInstrumentation.java | 2 +- 5 files changed, 8 insertions(+), 13 deletions(-) diff --git a/instrumentation/ratpack/ratpack-1.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ratpack/v1_7/DefaultExecControllerInstrumentation.java b/instrumentation/ratpack/ratpack-1.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ratpack/v1_7/DefaultExecControllerInstrumentation.java index 3d16352fbe5a..fb464efece3c 100644 --- a/instrumentation/ratpack/ratpack-1.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ratpack/v1_7/DefaultExecControllerInstrumentation.java +++ b/instrumentation/ratpack/ratpack-1.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ratpack/v1_7/DefaultExecControllerInstrumentation.java @@ -48,7 +48,7 @@ public void transform(TypeTransformer transformer) { @SuppressWarnings("unused") public static class SetInitializersAdvice { - @Advice.OnMethodEnter(suppress = Throwable.class, inline = false) + @Advice.OnMethodEnter(suppress = Throwable.class) @Advice.AssignReturned.ToArguments(@ToArgument(0)) public static ImmutableList enter( @Advice.Argument(0) ImmutableList initializers) { @@ -61,7 +61,7 @@ public static ImmutableList enter( @SuppressWarnings("unused") public static class SetInterceptorsAdvice { - @Advice.OnMethodEnter(suppress = Throwable.class, inline = false) + @Advice.OnMethodEnter(suppress = Throwable.class) @Advice.AssignReturned.ToArguments(@ToArgument(0)) public static ImmutableList enter( @Advice.Argument(0) ImmutableList interceptors) { @@ -76,7 +76,7 @@ public static ImmutableList enter( public static class ConstructorAdvice { @SuppressWarnings("UnusedVariable") - @Advice.OnMethodExit(suppress = Throwable.class, inline = false) + @Advice.OnMethodExit(suppress = Throwable.class) @Advice.AssignReturned.ToFields({ @ToField(value = "initializers", index = 0), @ToField(value = "interceptors", index = 1) diff --git a/instrumentation/ratpack/ratpack-1.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ratpack/v1_7/HttpClientInstrumentation.java b/instrumentation/ratpack/ratpack-1.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ratpack/v1_7/HttpClientInstrumentation.java index 0fcdef428d80..1c6b34b1ff34 100644 --- a/instrumentation/ratpack/ratpack-1.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ratpack/v1_7/HttpClientInstrumentation.java +++ b/instrumentation/ratpack/ratpack-1.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ratpack/v1_7/HttpClientInstrumentation.java @@ -37,7 +37,7 @@ public void transform(TypeTransformer transformer) { @SuppressWarnings("unused") public static class OfAdvice { - @Advice.OnMethodExit(suppress = Throwable.class, inline = false) + @Advice.OnMethodExit(suppress = Throwable.class) @Advice.AssignReturned.ToReturned public static HttpClient injectTracing(@Advice.Return HttpClient httpClient) throws Exception { return RatpackSingletons.telemetry().instrumentHttpClient(httpClient); diff --git a/instrumentation/ratpack/ratpack-1.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ratpack/v1_7/RatpackInstrumentationModule.java b/instrumentation/ratpack/ratpack-1.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ratpack/v1_7/RatpackInstrumentationModule.java index 3f00fa32bfc0..a98e61d4e0f2 100644 --- a/instrumentation/ratpack/ratpack-1.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ratpack/v1_7/RatpackInstrumentationModule.java +++ b/instrumentation/ratpack/ratpack-1.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ratpack/v1_7/RatpackInstrumentationModule.java @@ -28,11 +28,6 @@ public String getModuleGroup() { return "netty"; } - @Override - public boolean isIndyModule() { - return true; - } - @Override public ElementMatcher.Junction classLoaderMatcher() { // Only activate when running ratpack 1.7 or later diff --git a/instrumentation/ratpack/ratpack-1.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ratpack/v1_7/RequestActionSupportInstrumentation.java b/instrumentation/ratpack/ratpack-1.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ratpack/v1_7/RequestActionSupportInstrumentation.java index e57b93735fd7..16952ab1c4d4 100644 --- a/instrumentation/ratpack/ratpack-1.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ratpack/v1_7/RequestActionSupportInstrumentation.java +++ b/instrumentation/ratpack/ratpack-1.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ratpack/v1_7/RequestActionSupportInstrumentation.java @@ -61,7 +61,7 @@ public static void injectChannelAttribute( @SuppressWarnings("unused") public static class ConnectDownstreamAdvice { - @Advice.OnMethodEnter(suppress = Throwable.class, inline = false) + @Advice.OnMethodEnter(suppress = Throwable.class) @Advice.AssignReturned.ToArguments(@ToArgument(0)) public static Object wrapDownstream(@Advice.Argument(0) Downstream downstream) { // Propagate the current context to downstream @@ -73,7 +73,7 @@ public static Object wrapDownstream(@Advice.Argument(0) Downstream downstream @SuppressWarnings("unused") public static class ContextAdvice { - @Advice.OnMethodEnter(suppress = Throwable.class, inline = false) + @Advice.OnMethodEnter(suppress = Throwable.class) public static Scope injectChannelAttribute( @Advice.FieldValue("execution") Execution execution) { @@ -85,7 +85,7 @@ public static Scope injectChannelAttribute( .orElse(null); } - @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class, inline = false) + @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void exit(@Advice.Enter Scope scope) { if (scope != null) { scope.close(); diff --git a/instrumentation/ratpack/ratpack-1.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ratpack/v1_7/ServerRegistryInstrumentation.java b/instrumentation/ratpack/ratpack-1.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ratpack/v1_7/ServerRegistryInstrumentation.java index 50d055bdb991..7484d9637afc 100644 --- a/instrumentation/ratpack/ratpack-1.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ratpack/v1_7/ServerRegistryInstrumentation.java +++ b/instrumentation/ratpack/ratpack-1.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ratpack/v1_7/ServerRegistryInstrumentation.java @@ -34,7 +34,7 @@ public void transform(TypeTransformer transformer) { @SuppressWarnings("unused") public static class BuildAdvice { - @Advice.OnMethodExit(suppress = Throwable.class, inline = false) + @Advice.OnMethodExit(suppress = Throwable.class) @Advice.AssignReturned.ToReturned public static Registry injectTracing(@Advice.Return Registry registry) { return registry.join(