indy instrumentation - leftovers migration

instrumentation/internal/internal-lambda/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/lambda/LambdaInstrumentationModule.java

@@ -10,13 +10,17 @@
 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 io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import java.util.ArrayList;
 import java.util.List;
 import net.bytebuddy.utility.JavaModule;
 
 @AutoService(InstrumentationModule.class)
-public class LambdaInstrumentationModule extends InstrumentationModule {
+public class LambdaInstrumentationModule extends InstrumentationModule
+    implements ExperimentalInstrumentationModule {
   public LambdaInstrumentationModule() {
     super("internal-lambda");
   }
@@ -28,8 +32,17 @@ public boolean defaultEnabled(ConfigProperties config) {
   }
 
   @Override
-  public boolean isIndyModule() {
-    return false;
+  public void injectClasses(ClassInjector injector) {
+    injector
+        .proxyBuilder(
+            "io.opentelemetry.javaagent.instrumentation.internal.lambda.LambdaTransformer")
+        .inject(InjectionMode.CLASS_ONLY);
+    if (JavaModule.isSupported()) {
+      injector
+          .proxyBuilder(
+              "io.opentelemetry.javaagent.instrumentation.internal.lambda.Java9LambdaTransformer")
+          .inject(InjectionMode.CLASS_ONLY);
+    }
   }
 
   @Override

instrumentation/kotlinx-coroutines/kotlinx-coroutines-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kotlinxcoroutines/instrumentationannotations/AnnotationInstrumentationModule.java

@@ -11,12 +11,15 @@
 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 java.util.Arrays;
 import java.util.List;
 import net.bytebuddy.matcher.ElementMatcher;
 
 /** Instrumentation for methods annotated with {@code WithSpan} annotation. */
 @AutoService(InstrumentationModule.class)
-public class AnnotationInstrumentationModule extends InstrumentationModule {
+public class AnnotationInstrumentationModule extends InstrumentationModule
+    implements ExperimentalInstrumentationModule {
 
   public AnnotationInstrumentationModule() {
     super(
@@ -26,12 +29,6 @@ public AnnotationInstrumentationModule() {
         "opentelemetry-instrumentation-annotations");
   }
 
-  @Override
-  public boolean isIndyModule() {
-    // needs helper classes in the same class loader
-    return false;
-  }
-
   @Override
   public int order() {
     // Run first to ensure other automatic instrumentation is added after and therefore is executed
@@ -50,4 +47,13 @@ public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
   public List<TypeInstrumentation> typeInstrumentations() {
     return singletonList(new WithSpanInstrumentation());
   }
+
+  @Override
+  public List<String> injectedClassNames() {
+    return Arrays.asList(
+        "io.opentelemetry.javaagent.instrumentation.kotlinxcoroutines.instrumentationannotations.AnnotationSingletons",
+        "io.opentelemetry.javaagent.instrumentation.kotlinxcoroutines.instrumentationannotations.AnnotationInstrumentationHelper",
+        "io.opentelemetry.javaagent.instrumentation.kotlinxcoroutines.instrumentationannotations.MethodRequest",
+        "io.opentelemetry.javaagent.instrumentation.kotlinxcoroutines.instrumentationannotations.MethodRequestCodeAttributesGetter");
+  }
 }

testing-common/integration-tests/build.gradle.kts

@@ -52,15 +52,13 @@ tasks {
       includeTestsMatching("InstrumentOldBytecode")
     }
     include("**/InstrumentOldBytecode.*")
-    jvmArgs("-Dotel.instrumentation.inline-ibm-resource-level.enabled=false")
   }
 
   val testInlineModuleOldBytecodeInstrumentation by registering(Test::class) {
     filter {
       includeTestsMatching("InstrumentOldBytecode")
     }
     include("**/InstrumentOldBytecode.*")
-    jvmArgs("-Dotel.instrumentation.indy-ibm-resource-level.enabled=false")
   }
 
   test {

testing-common/integration-tests/src/main/java/InlineIbmResourceLevelInstrumentationModule.java → testing-common/integration-tests/src/main/java/IbmResourceLevelInstrumentationModule.java

@@ -11,13 +11,13 @@
 import java.util.List;
 
 @AutoService(InstrumentationModule.class)
-public class InlineIbmResourceLevelInstrumentationModule extends InstrumentationModule {
-  public InlineIbmResourceLevelInstrumentationModule() {
-    super("inline-ibm-resource-level");
+public class IbmResourceLevelInstrumentationModule extends InstrumentationModule {
+  public IbmResourceLevelInstrumentationModule() {
+    super("ibm-resource-level");
   }
 
   @Override
   public List<TypeInstrumentation> typeInstrumentations() {
-    return singletonList(new InlineResourceLevelInstrumentation());
+    return singletonList(new ResourceLevelInstrumentation());
   }
 }

testing-common/integration-tests/src/main/java/IndyResourceLevelInstrumentation.java → testing-common/integration-tests/src/main/java/ResourceLevelInstrumentation.java

@@ -11,7 +11,7 @@
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
 
-public class IndyResourceLevelInstrumentation implements TypeInstrumentation {
+public class ResourceLevelInstrumentation implements TypeInstrumentation {
   @Override
   public ElementMatcher<TypeDescription> typeMatcher() {
     return named("com.ibm.as400.resource.ResourceLevel");
@@ -25,7 +25,7 @@ public void transform(TypeTransformer transformer) {
 
   @SuppressWarnings("unused")
   public static class ToStringAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class, inline = false)
+    @Advice.OnMethodExit(suppress = Throwable.class)
     @Advice.AssignReturned.ToReturned
     public static String toStringReplace() {
       return "instrumented";