Delete ClassInjector api

Author: laurit

instrumentation/internal/internal-reflection/javaagent-integration-tests/src/main/java/instrumentation/TestHelperClass.java

@@ -5,20 +5,16 @@
 
 package instrumentation;
 
-import static java.util.Arrays.asList;
 import static java.util.Collections.singletonList;
 
 import com.google.auto.service.AutoService;
 import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
-import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule;
-import io.opentelemetry.javaagent.extension.instrumentation.internal.injection.ClassInjector;
-import io.opentelemetry.javaagent.extension.instrumentation.internal.injection.InjectionMode;
 import java.util.List;
 
 @AutoService(InstrumentationModule.class)
-public class TestInstrumentationModule extends InstrumentationModule
-    implements ExperimentalInstrumentationModule {
+public class TestInstrumentationModule extends InstrumentationModule {
+
   public TestInstrumentationModule() {
     super("test-instrumentation");
   }
@@ -27,22 +23,4 @@ public TestInstrumentationModule() {
   public List<TypeInstrumentation> typeInstrumentations() {
     return singletonList(new TestTypeInstrumentation());
   }
-
-  @Override
-  public List<String> getAdditionalHelperClassNames() {
-    // makes the class from instrumentation from the instrumented class with inlined advice
-    return asList("instrumentation.TestHelperClass");
-  }
-
-  @Override
-  public boolean isHelperClass(String className) {
-    return "instrumentation.TestSingletons".equals(className);
-  }
-
-  @Override
-  public void injectClasses(ClassInjector injector) {
-    injector
-        .proxyBuilder("instrumentation.TestHelperClass")
-        .inject(InjectionMode.CLASS_AND_RESOURCE);
-  }
 }

instrumentation/internal/internal-reflection/javaagent-integration-tests/src/main/java/instrumentation/TestInstrumentationModule.java

@@ -7,8 +7,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import instrumentation.TestHelperClass;
-import io.opentelemetry.javaagent.bootstrap.InstrumentationProxy;
 import io.opentelemetry.javaagent.bootstrap.field.VirtualFieldAccessorMarker;
 import io.opentelemetry.javaagent.bootstrap.field.VirtualFieldInstalledMarker;
 import java.io.ObjectStreamClass;
@@ -49,36 +47,4 @@ void testGeneratedSerialVersionUid() {
         .isEqualTo(1115158932483123524L);
     assertThat(TestClass.class.getDeclaredFields()).isEmpty();
   }
-
-  @Test
-  void testInjectedClassProxyUnwrap() throws Exception {
-    TestClass testClass = new TestClass();
-    Class<?> helperType = testClass.testHelperClass();
-    assertThat(helperType).isNotNull();
-
-    Object instance = helperType.getConstructor().newInstance();
-    if (InstrumentationProxy.class.isAssignableFrom(helperType)) {
-      // indy advice: must be an indy proxy
-
-      for (Method method : helperType.getMethods()) {
-        assertThat(method.getName()).isNotEqualTo("__getIndyProxyDelegate");
-      }
-
-      for (Class<?> interfaceType : helperType.getInterfaces()) {
-        assertThat(interfaceType).isNotEqualTo(InstrumentationProxy.class);
-      }
-
-      assertThat(instance).isInstanceOf(InstrumentationProxy.class);
-
-      Object proxyDelegate = ((InstrumentationProxy) instance).__getIndyProxyDelegate();
-      assertThat(proxyDelegate).isNotInstanceOf(InstrumentationProxy.class);
-
-    } else {
-      // inline advice: must be of the expected type
-      assertThat(helperType).isEqualTo(TestHelperClass.class);
-      assertThat(instance)
-          .isInstanceOf(TestHelperClass.class)
-          .isNotInstanceOf(InstrumentationProxy.class);
-    }
-  }
 }

instrumentation/internal/internal-reflection/javaagent-integration-tests/src/test/java/io/opentelemetry/javaagent/instrumentation/internal/reflection/ReflectionTest.java

@@ -19,13 +19,4 @@ public String testMethod() {
   public String testMethod2() {
     return "not instrumented";
   }
-
-  public Class<?> testHelperClass() {
-    try {
-      return Class.forName(
-          "instrumentation.TestHelperClass", false, TestClass.class.getClassLoader());
-    } catch (ClassNotFoundException e) {
-      return null;
-    }
-  }
 }

instrumentation/internal/internal-reflection/javaagent-integration-tests/src/test/java/io/opentelemetry/javaagent/instrumentation/internal/reflection/TestClass.java

@@ -11,6 +11,8 @@
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
 import io.opentelemetry.javaagent.extension.instrumentation.internal.AsmApi;
+import io.opentelemetry.javaagent.tooling.instrumentation.indy.IndyBootstrap;
+import io.opentelemetry.javaagent.tooling.instrumentation.indy.IndyTypeTransformerImpl;
 import net.bytebuddy.asm.AsmVisitorWrapper;
 import net.bytebuddy.description.field.FieldDescription;
 import net.bytebuddy.description.field.FieldList;
@@ -58,15 +60,18 @@ public ClassVisitor wrap(
                       MethodList<?> methods,
                       int writerFlags,
                       int readerFlags) {
-                    return new ClassClassVisitor(classVisitor);
+                    return new ClassClassVisitor(
+                        classVisitor, transformer instanceof IndyTypeTransformerImpl);
                   }
                 }));
   }
 
   private static class ClassClassVisitor extends ClassVisitor {
+    private final boolean isIndy;
 
-    ClassClassVisitor(ClassVisitor cv) {
+    ClassClassVisitor(ClassVisitor cv, boolean isIndy) {
       super(AsmApi.VERSION, cv);
+      this.isIndy = isIndy;
     }
 
     @Override
@@ -92,12 +97,21 @@ public void visitMethodInsn(
                         && "java/lang/J9VMInternals".equals(owner)
                         && "(Ljava/lang/Class;)[Ljava/lang/Class;".equals(descriptor))) {
                   super.visitVarInsn(Opcodes.ALOAD, 0);
-                  super.visitMethodInsn(
-                      Opcodes.INVOKESTATIC,
-                      Type.getInternalName(ReflectionHelper.class),
-                      "filterInterfaces",
-                      "([Ljava/lang/Class;Ljava/lang/Class;)[Ljava/lang/Class;",
-                      false);
+                  if (isIndy) {
+                    IndyBootstrap.invokeStatic(
+                        mv,
+                        "filterInterfaces",
+                        "([Ljava/lang/Class;Ljava/lang/Class;)[Ljava/lang/Class;",
+                        ReflectionInstrumentationModule.class,
+                        ReflectionHelper.class.getName());
+                  } else {
+                    super.visitMethodInsn(
+                        Opcodes.INVOKESTATIC,
+                        Type.getInternalName(ReflectionHelper.class),
+                        "filterInterfaces",
+                        "([Ljava/lang/Class;Ljava/lang/Class;)[Ljava/lang/Class;",
+                        false);
+                  }
                 }
               }
             };

instrumentation/internal/internal-reflection/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/reflection/ClassInstrumentation.java

@@ -5,7 +5,6 @@
 
 package io.opentelemetry.javaagent.instrumentation.internal.reflection;
 
-import io.opentelemetry.javaagent.bootstrap.InstrumentationProxy;
 import io.opentelemetry.javaagent.bootstrap.field.VirtualFieldAccessorMarker;
 import io.opentelemetry.javaagent.bootstrap.field.VirtualFieldDetector;
 import io.opentelemetry.javaagent.bootstrap.field.VirtualFieldInstalledMarker;
@@ -70,8 +69,6 @@ public static Class<?>[] filterInterfaces(Class<?>[] interfaces, Class<?> contai
       // filter out virtual field marker and accessor interfaces
       if (interfaceClass == VirtualFieldInstalledMarker.class) {
         continue;
-      } else if (interfaceClass == InstrumentationProxy.class) {
-        continue;
       } else if (VirtualFieldAccessorMarker.class.isAssignableFrom(interfaceClass)
           && interfaceClass.isSynthetic()
           && interfaceClass.getName().contains("VirtualFieldAccessor$")) {
@@ -87,7 +84,6 @@ public static Class<?>[] filterInterfaces(Class<?>[] interfaces, Class<?> contai
   }
 
   private static boolean noInterfaceToHide(Class<?> containingClass) {
-    return !VirtualFieldInstalledMarker.class.isAssignableFrom(containingClass)
-        && !InstrumentationProxy.class.isAssignableFrom(containingClass);
+    return !VirtualFieldInstalledMarker.class.isAssignableFrom(containingClass);
   }
 }

instrumentation/internal/internal-reflection/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/reflection/ReflectionHelper.java

@@ -10,14 +10,10 @@
 import com.google.auto.service.AutoService;
 import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
-import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule;
-import io.opentelemetry.javaagent.extension.instrumentation.internal.injection.ClassInjector;
-import io.opentelemetry.javaagent.extension.instrumentation.internal.injection.InjectionMode;
 import java.util.List;
 
 @AutoService(InstrumentationModule.class)
-public class ReflectionInstrumentationModule extends InstrumentationModule
-    implements ExperimentalInstrumentationModule {
+public class ReflectionInstrumentationModule extends InstrumentationModule {
   public ReflectionInstrumentationModule() {
     super("internal-reflection");
   }
@@ -32,15 +28,4 @@ public boolean defaultEnabled() {
   public List<TypeInstrumentation> typeInstrumentations() {
     return asList(new ClassInstrumentation(), new ReflectionInstrumentation());
   }
-
-  @Override
-  public void injectClasses(ClassInjector injector) {
-    // we do not use ByteBuddy Advice dispatching in this instrumentation
-    // Instead, we manually call ReflectionHelper via ASM
-    // Easiest solution to work with indy is to inject an indy-proxy to be invoked
-    injector
-        .proxyBuilder(
-            "io.opentelemetry.javaagent.instrumentation.internal.reflection.ReflectionHelper")
-        .inject(InjectionMode.CLASS_ONLY);
-  }
 }