move virtual field for indy migration

Author: SylvainJuge

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

@@ -34,10 +34,20 @@ public List<String> getAdditionalHelperClassNames() {
     return Arrays.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);
   }
+
+  @Override
+  public boolean isIndyReady() {
+    return true;
+  }
 }

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

@@ -0,0 +1,16 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package instrumentation;
+
+import io.opentelemetry.instrumentation.api.util.VirtualField;
+
+public class TestSingletons {
+
+  public static final VirtualField<Runnable, String> STRING =
+      VirtualField.find(Runnable.class, String.class);
+
+  private TestSingletons() {}
+}

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

@@ -5,9 +5,9 @@
 
 package instrumentation;
 
+import static instrumentation.TestSingletons.STRING;
 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;
@@ -36,7 +36,7 @@ public static class TestAdvice {
     @AssignReturned.ToReturned
     @Advice.OnMethodExit
     public static String methodExit(@Advice.This Runnable test) {
-      VirtualField.find(Runnable.class, String.class).set(test, "instrumented");
+      STRING.set(test, "instrumented");
       return "instrumented";
     }
   }
@@ -47,7 +47,7 @@ public static class Test2Advice {
     @AssignReturned.ToReturned
     @Advice.OnMethodExit
     public static String methodExit(@Advice.This Runnable test) {
-      return VirtualField.find(Runnable.class, String.class).get(test);
+      return STRING.get(test);
     }
   }
 }