Treat all advice as inline when indy is disabled (#17442)

Author: laurit

javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/instrumentation/TypeTransformerImpl.java

@@ -8,6 +8,7 @@
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
 import io.opentelemetry.javaagent.tooling.Utils;
 import io.opentelemetry.javaagent.tooling.bytebuddy.ExceptionHandlers;
+import io.opentelemetry.javaagent.tooling.instrumentation.indy.AdviceInliningPoolStrategy;
 import io.opentelemetry.javaagent.tooling.instrumentation.indy.ForceDynamicallyTypedAssignReturnedFactory;
 import java.util.function.Function;
 import net.bytebuddy.agent.builder.AgentBuilder;
@@ -33,13 +34,18 @@ public void applyAdviceToMethod(
       ElementMatcher<? super MethodDescription> methodMatcher,
       Function<Advice.WithCustomMapping, Advice.WithCustomMapping> mappingCustomizer,
       String adviceClassName) {
+    // default strategy used by AgentBuilder.Transformer.ForAdvice
+    AgentBuilder.PoolStrategy poolStrategy = AgentBuilder.PoolStrategy.Default.FAST;
+
     agentBuilder =
         agentBuilder.transform(
             new AgentBuilder.Transformer.ForAdvice(mappingCustomizer.apply(adviceMapping))
                 .include(
                     Utils.getBootstrapProxy(),
                     Utils.getAgentClassLoader(),
                     Utils.getExtensionsClassLoader())
+                // set the advice "inline" attribute to true
+                .with(new AdviceInliningPoolStrategy(poolStrategy, true))
                 .withExceptionHandler(ExceptionHandlers.defaultExceptionHandler())
                 .advice(methodMatcher, adviceClassName));
   }

…n/indy/AdviceUninliningPoolStrategy.java …ion/indy/AdviceInliningPoolStrategy.javajavaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/instrumentation/indy/AdviceUninliningPoolStrategy.java renamed to javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/instrumentation/indy/AdviceInliningPoolStrategy.java javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/instrumentation/indy/AdviceUninliningPoolStrategy.java renamed to javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/instrumentation/indy/AdviceInliningPoolStrategy.java

@@ -24,36 +24,40 @@
 import org.jetbrains.annotations.NotNull;
 
 /**
- * Pool strategy that sets "inline" attribute to false on {@link Advice.OnMethodEnter} and {@link
+ * Pool strategy that sets "inline" attribute on {@link Advice.OnMethodEnter} and {@link
  * Advice.OnMethodExit} annotations.
  */
-class AdviceUninliningPoolStrategy implements AgentBuilder.PoolStrategy {
+public class AdviceInliningPoolStrategy implements AgentBuilder.PoolStrategy {
   private final AgentBuilder.PoolStrategy poolStrategy;
+  private final boolean inline;
 
-  public AdviceUninliningPoolStrategy(AgentBuilder.PoolStrategy poolStrategy) {
+  public AdviceInliningPoolStrategy(AgentBuilder.PoolStrategy poolStrategy, boolean inline) {
     this.poolStrategy = poolStrategy;
+    this.inline = inline;
   }
 
   @NotNull
   @Override
   public TypePool typePool(@NotNull ClassFileLocator classFileLocator, ClassLoader classLoader) {
     TypePool typePool = poolStrategy.typePool(classFileLocator, classLoader);
-    return new TypePoolWrapper(typePool);
+    return new TypePoolWrapper(typePool, inline);
   }
 
   @NotNull
   @Override
   public TypePool typePool(
       @NotNull ClassFileLocator classFileLocator, ClassLoader classLoader, @NotNull String name) {
     TypePool typePool = poolStrategy.typePool(classFileLocator, classLoader, name);
-    return new TypePoolWrapper(typePool);
+    return new TypePoolWrapper(typePool, inline);
   }
 
   private static class TypePoolWrapper implements TypePool {
     private final TypePool typePool;
+    private final boolean inline;
 
-    TypePoolWrapper(TypePool typePool) {
+    TypePoolWrapper(TypePool typePool, boolean inline) {
       this.typePool = typePool;
+      this.inline = inline;
     }
 
     @NotNull
@@ -96,7 +100,7 @@ class MethodListWrapper
 
                 @Override
                 public MethodDescription.InDefinedShape get(int index) {
-                  return new MethodDescriptionWrapper(methods.get(index));
+                  return new MethodDescriptionWrapper(methods.get(index), inline);
                 }
 
                 @Override
@@ -119,9 +123,11 @@ public void clear() {
   }
 
   private static class MethodDescriptionWrapper extends DelegatingMethodDescription {
+    private final boolean inline;
 
-    MethodDescriptionWrapper(MethodDescription.InDefinedShape method) {
+    MethodDescriptionWrapper(MethodDescription.InDefinedShape method, boolean inline) {
       super(method);
+      this.inline = inline;
     }
 
     @NotNull
@@ -141,9 +147,9 @@ public AnnotationDescription get(int index) {
             return annotation;
           }
 
-          // replace value for "inline" attribute with false
+          // replace value for "inline" attribute
           return replaceAnnotationValue(
-              annotation, "inline", oldVal -> AnnotationValue.ForConstant.of(false));
+              annotation, "inline", oldVal -> AnnotationValue.ForConstant.of(inline));
         }
 
         @Override

javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/instrumentation/indy/IndyTypeTransformerImpl.java

@@ -62,7 +62,9 @@ public void applyAdviceToMethod(
                 .advice(methodMatcher, adviceClassName)
                 // advice transformation already performs uninlining
                 .with(
-                    transformAdvice ? poolStrategy : new AdviceUninliningPoolStrategy(poolStrategy))
+                    transformAdvice
+                        ? poolStrategy
+                        : new AdviceInliningPoolStrategy(poolStrategy, false))
                 .include(getAdviceLocator(instrumentationModule.getClass().getClassLoader()))
                 .withExceptionHandler(ExceptionHandlers.defaultExceptionHandler()));
   }