revert changes for integration tests

Author: SylvainJuge

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

@@ -5,17 +5,11 @@
 
 package instrumentation;
 
-import io.opentelemetry.instrumentation.api.util.VirtualField;
-
 /**
  * Class that will be injected in target classloader with inline instrumentation and proxied with
  * indy instrumentation
  */
 public class TestHelperClass {
 
-  // virtual field needs to be in an helper class for indy instrumentation
-  public static final VirtualField<Runnable, String> VIRTUAL_FIELD =
-      VirtualField.find(Runnable.class, String.class);
-
   public TestHelperClass() {}
 }

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

@@ -40,9 +40,4 @@ public void injectClasses(ClassInjector injector) {
         .proxyBuilder("instrumentation.TestHelperClass")
         .inject(InjectionMode.CLASS_AND_RESOURCE);
   }
-
-  @Override
-  public boolean isIndyReady() {
-    return true;
-  }
 }

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

@@ -7,10 +7,10 @@
 
 import static net.bytebuddy.matcher.ElementMatchers.named;
 
+import io.opentelemetry.instrumentation.api.util.VirtualField;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
 import net.bytebuddy.asm.Advice;
-import net.bytebuddy.asm.Advice.AssignReturned;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
 
@@ -32,21 +32,21 @@ public void transform(TypeTransformer transformer) {
   @SuppressWarnings("unused")
   public static class TestAdvice {
 
-    @AssignReturned.ToReturned
     @Advice.OnMethodExit
-    public static String methodExit(@Advice.This Runnable test) {
-      TestHelperClass.VIRTUAL_FIELD.set(test, "instrumented");
-      return "instrumented";
+    public static void methodExit(
+        @Advice.This Runnable test, @Advice.Return(readOnly = false) String result) {
+      VirtualField.find(Runnable.class, String.class).set(test, "instrumented");
+      result = "instrumented";
     }
   }
 
   @SuppressWarnings("unused")
   public static class Test2Advice {
 
-    @AssignReturned.ToReturned
     @Advice.OnMethodExit
-    public static String methodExit(@Advice.This Runnable test) {
-      return TestHelperClass.VIRTUAL_FIELD.get(test);
+    public static void methodExit(
+        @Advice.This Runnable test, @Advice.Return(readOnly = false) String result) {
+      result = VirtualField.find(Runnable.class, String.class).get(test);
     }
   }
 }