(chore) remove indy specific inlining per review

open-telemetry · Nov 14, 2024 · c7e5d8b · c7e5d8b
1 parent 093aeaa
commit c7e5d8b
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 13 deletions.
diff --git a/...elemetry/javaagent/instrumentation/ratpack/v1_7/DefaultExecControllerInstrumentation.java b/...elemetry/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<? extends ExecInitializer> enter(
         @Advice.Argument(0) ImmutableList<? extends ExecInitializer> initializers) {
@@ -61,7 +61,7 @@ public static ImmutableList<? extends ExecInitializer> 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<? extends ExecInterceptor> enter(
         @Advice.Argument(0) ImmutableList<? extends ExecInterceptor> interceptors) {
@@ -76,7 +76,7 @@ public static ImmutableList<? extends ExecInterceptor> 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/...va/io/opentelemetry/javaagent/instrumentation/ratpack/v1_7/HttpClientInstrumentation.java b/...va/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/...io/opentelemetry/javaagent/instrumentation/ratpack/v1_7/RatpackInstrumentationModule.java b/...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<ClassLoader> classLoaderMatcher() {
     // Only activate when running ratpack 1.7 or later

diff --git a/...telemetry/javaagent/instrumentation/ratpack/v1_7/RequestActionSupportInstrumentation.java b/...telemetry/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/...o/opentelemetry/javaagent/instrumentation/ratpack/v1_7/ServerRegistryInstrumentation.java b/...o/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(