remove invalid virtual field usages

Author: SylvainJuge

instrumentation/async-http-client/async-http-client-1.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v1_9/ResponseInstrumentation.java

@@ -14,10 +14,8 @@
 import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
 
 import com.ning.http.client.AsyncCompletionHandler;
-import com.ning.http.client.AsyncHandler;
 import com.ning.http.client.Response;
 import io.opentelemetry.context.Scope;
-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;
@@ -55,7 +53,6 @@ public static class OnCompletedAdvice {
     public static Scope onEnter(
         @Advice.This AsyncCompletionHandler<?> handler, @Advice.Argument(0) Response response) {
 
-      VirtualField<AsyncHandler<?>, AsyncHandlerData> virtualField = virtualField();
       AsyncHandlerData data = virtualField().get(handler);
       if (data == null) {
         return null;

instrumentation/async-http-client/async-http-client-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v2_0/AsyncCompletionHandlerInstrumentation.java

@@ -6,21 +6,20 @@
 package io.opentelemetry.javaagent.instrumentation.asynchttpclient.v2_0;
 
 import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
+import static io.opentelemetry.javaagent.instrumentation.asynchttpclient.v2_0.AsyncHttpClientSingletons.asyncHandlerVirtualField;
 import static io.opentelemetry.javaagent.instrumentation.asynchttpclient.v2_0.AsyncHttpClientSingletons.instrumenter;
 import static net.bytebuddy.matcher.ElementMatchers.hasSuperClass;
 import static net.bytebuddy.matcher.ElementMatchers.isPublic;
 import static net.bytebuddy.matcher.ElementMatchers.named;
 import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
 
 import io.opentelemetry.context.Scope;
-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.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
 import org.asynchttpclient.AsyncCompletionHandler;
-import org.asynchttpclient.AsyncHandler;
 import org.asynchttpclient.Response;
 
 public class AsyncCompletionHandlerInstrumentation implements TypeInstrumentation {
@@ -54,13 +53,11 @@ public static class OnCompletedAdvice {
     public static Scope onEnter(
         @Advice.This AsyncCompletionHandler<?> handler, @Advice.Argument(0) Response response) {
 
-      VirtualField<AsyncHandler<?>, RequestContext> virtualField =
-          VirtualField.find(AsyncHandler.class, RequestContext.class);
-      RequestContext requestContext = virtualField.get(handler);
+      RequestContext requestContext = asyncHandlerVirtualField().get(handler);
       if (requestContext == null) {
         return null;
       }
-      virtualField.set(handler, null);
+      asyncHandlerVirtualField().set(handler, null);
       instrumenter().end(requestContext.getContext(), requestContext, response, null);
       return requestContext.getParentContext().makeCurrent();
     }
@@ -80,13 +77,11 @@ public static class OnThrowableAdvice {
     public static Scope onEnter(
         @Advice.This AsyncCompletionHandler<?> handler, @Advice.Argument(0) Throwable throwable) {
 
-      VirtualField<AsyncHandler<?>, RequestContext> virtualField =
-          VirtualField.find(AsyncHandler.class, RequestContext.class);
-      RequestContext requestContext = virtualField.get(handler);
+      RequestContext requestContext = asyncHandlerVirtualField().get(handler);
       if (requestContext == null) {
         return null;
       }
-      virtualField.set(handler, null);
+      asyncHandlerVirtualField().set(handler, null);
       instrumenter().end(requestContext.getContext(), requestContext, null, throwable);
       return requestContext.getParentContext().makeCurrent();
     }

instrumentation/async-http-client/async-http-client-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v2_0/AsyncHttpClientInstrumentation.java

@@ -7,8 +7,8 @@
 
 import static io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge.currentContext;
 import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.implementsInterface;
+import static io.opentelemetry.javaagent.instrumentation.asynchttpclient.v2_0.AsyncHttpClientSingletons.asyncHandlerVirtualField;
 import static io.opentelemetry.javaagent.instrumentation.asynchttpclient.v2_0.AsyncHttpClientSingletons.instrumenter;
-import static io.opentelemetry.javaagent.instrumentation.asynchttpclient.v2_0.AsyncHttpClientSingletons.virtualField;
 import static net.bytebuddy.matcher.ElementMatchers.isPublic;
 import static net.bytebuddy.matcher.ElementMatchers.named;
 import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
@@ -71,7 +71,7 @@ public static Scope onEnter(
       // 2.1, so the instrumentation module will need to be essentially duplicated (or a common
       // module introduced)
 
-      virtualField().set(handler, requestContext);
+      asyncHandlerVirtualField().set(handler, requestContext);
       return context.makeCurrent();
     }
 

instrumentation/async-http-client/async-http-client-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v2_0/AsyncHttpClientSingletons.java

@@ -5,17 +5,20 @@
 
 package io.opentelemetry.javaagent.instrumentation.asynchttpclient.v2_0;
 
+import io.opentelemetry.context.Context;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
 import io.opentelemetry.instrumentation.api.util.VirtualField;
 import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpClientInstrumenters;
 import org.asynchttpclient.AsyncHandler;
+import org.asynchttpclient.Request;
 import org.asynchttpclient.Response;
 
 public final class AsyncHttpClientSingletons {
   private static final String INSTRUMENTATION_NAME = "io.opentelemetry.async-http-client-2.0";
 
   private static final Instrumenter<RequestContext, Response> INSTRUMENTER;
-  private static final VirtualField<AsyncHandler<?>, RequestContext> VIRTUAL_FIELD;
+  private static final VirtualField<AsyncHandler<?>, RequestContext> ASYNC_HANDLER_VIRTUAL_FIELD;
+  private static final VirtualField<Request, Context> REQUEST_VIRTUAL_FIELD;
 
   static {
     INSTRUMENTER =
@@ -24,15 +27,20 @@ public final class AsyncHttpClientSingletons {
             new AsyncHttpClientHttpAttributesGetter(),
             HttpHeaderSetter.INSTANCE);
 
-    VIRTUAL_FIELD = VirtualField.find(AsyncHandler.class, RequestContext.class);
+    ASYNC_HANDLER_VIRTUAL_FIELD = VirtualField.find(AsyncHandler.class, RequestContext.class);
+    REQUEST_VIRTUAL_FIELD = VirtualField.find(Request.class, Context.class);
   }
 
   public static Instrumenter<RequestContext, Response> instrumenter() {
     return INSTRUMENTER;
   }
 
-  public static VirtualField<AsyncHandler<?>, RequestContext> virtualField() {
-    return VIRTUAL_FIELD;
+  public static VirtualField<AsyncHandler<?>, RequestContext> asyncHandlerVirtualField() {
+    return ASYNC_HANDLER_VIRTUAL_FIELD;
+  }
+
+  public static VirtualField<Request, Context> requestVirtualField() {
+    return REQUEST_VIRTUAL_FIELD;
   }
 
   private AsyncHttpClientSingletons() {}

instrumentation/async-http-client/async-http-client-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v2_0/NettyRequestSenderInstrumentation.java

@@ -5,21 +5,21 @@
 
 package io.opentelemetry.javaagent.instrumentation.asynchttpclient.v2_0;
 
+import static io.opentelemetry.javaagent.instrumentation.asynchttpclient.v2_0.AsyncHttpClientSingletons.asyncHandlerVirtualField;
+import static io.opentelemetry.javaagent.instrumentation.asynchttpclient.v2_0.AsyncHttpClientSingletons.requestVirtualField;
 import static net.bytebuddy.matcher.ElementMatchers.isPublic;
 import static net.bytebuddy.matcher.ElementMatchers.named;
 import static net.bytebuddy.matcher.ElementMatchers.returns;
 import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
 
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;
-import io.opentelemetry.instrumentation.api.util.VirtualField;
 import io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
-import org.asynchttpclient.AsyncHandler;
 import org.asynchttpclient.Request;
 import org.asynchttpclient.netty.NettyResponseFuture;
 
@@ -59,8 +59,7 @@ public static class AttachContextAdvice {
 
     @Advice.OnMethodEnter
     public static void attachContext(@Advice.Argument(0) Request request) {
-      VirtualField.find(Request.class, Context.class)
-          .set(request, Java8BytecodeBridge.currentContext());
+      requestVirtualField().set(request, Java8BytecodeBridge.currentContext());
     }
   }
 
@@ -70,7 +69,7 @@ public static class MountContextAdvice {
     @Advice.OnMethodEnter
     public static Scope mountContext(@Advice.Argument(0) NettyResponseFuture<?> responseFuture) {
       Request request = responseFuture.getCurrentRequest();
-      Context context = VirtualField.find(Request.class, Context.class).get(request);
+      Context context = requestVirtualField().get(request);
       return context == null ? null : context.makeCurrent();
     }
 
@@ -88,8 +87,7 @@ public static class RememberNettyRequestAdvice {
     @Advice.OnMethodExit
     public static void rememberNettyRequest(@Advice.Return NettyResponseFuture<?> responseFuture) {
       RequestContext requestContext =
-          VirtualField.find(AsyncHandler.class, RequestContext.class)
-              .get(responseFuture.getAsyncHandler());
+          asyncHandlerVirtualField().get(responseFuture.getAsyncHandler());
       if (requestContext != null) {
         requestContext.setNettyRequest(responseFuture.getNettyRequest());
       }