fix few other virtualfield mis-usages

Author: SylvainJuge

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

@@ -33,7 +33,7 @@ public static Instrumenter<Request, Response> instrumenter() {
     return INSTRUMENTER;
   }
 
-  public static VirtualField<AsyncHandler<?>, AsyncHandlerData> getVirtualField() {
+  public static VirtualField<AsyncHandler<?>, AsyncHandlerData> virtualField() {
     return VIRTUAL_FIELD;
   }
 

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

@@ -6,8 +6,8 @@
 package io.opentelemetry.javaagent.instrumentation.asynchttpclient.v1_9;
 
 import static io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge.currentContext;
-import static io.opentelemetry.javaagent.instrumentation.asynchttpclient.v1_9.AsyncHttpClientSingletons.getVirtualField;
 import static io.opentelemetry.javaagent.instrumentation.asynchttpclient.v1_9.AsyncHttpClientSingletons.instrumenter;
+import static io.opentelemetry.javaagent.instrumentation.asynchttpclient.v1_9.AsyncHttpClientSingletons.virtualField;
 import static net.bytebuddy.matcher.ElementMatchers.isPublic;
 import static net.bytebuddy.matcher.ElementMatchers.named;
 import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
@@ -53,7 +53,7 @@ public static Scope onEnter(
       }
 
       Context context = instrumenter().start(parentContext, request);
-      getVirtualField().set(handler, AsyncHandlerData.create(parentContext, context, request));
+      virtualField().set(handler, AsyncHandlerData.create(parentContext, context, request));
       return context.makeCurrent();
     }
 

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

@@ -6,8 +6,8 @@
 package io.opentelemetry.javaagent.instrumentation.asynchttpclient.v1_9;
 
 import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
-import static io.opentelemetry.javaagent.instrumentation.asynchttpclient.v1_9.AsyncHttpClientSingletons.getVirtualField;
 import static io.opentelemetry.javaagent.instrumentation.asynchttpclient.v1_9.AsyncHttpClientSingletons.instrumenter;
+import static io.opentelemetry.javaagent.instrumentation.asynchttpclient.v1_9.AsyncHttpClientSingletons.virtualField;
 import static net.bytebuddy.matcher.ElementMatchers.hasSuperClass;
 import static net.bytebuddy.matcher.ElementMatchers.isPublic;
 import static net.bytebuddy.matcher.ElementMatchers.named;
@@ -55,12 +55,12 @@ public static class OnCompletedAdvice {
     public static Scope onEnter(
         @Advice.This AsyncCompletionHandler<?> handler, @Advice.Argument(0) Response response) {
 
-      VirtualField<AsyncHandler<?>, AsyncHandlerData> virtualField = getVirtualField();
-      AsyncHandlerData data = getVirtualField().get(handler);
+      VirtualField<AsyncHandler<?>, AsyncHandlerData> virtualField = virtualField();
+      AsyncHandlerData data = virtualField().get(handler);
       if (data == null) {
         return null;
       }
-      getVirtualField().set(handler, null);
+      virtualField().set(handler, null);
       instrumenter().end(data.getContext(), data.getRequest(), response, null);
       return data.getParentContext().makeCurrent();
     }
@@ -80,11 +80,11 @@ public static class OnThrowableAdvice {
     public static Scope onEnter(
         @Advice.This AsyncCompletionHandler<?> handler, @Advice.Argument(0) Throwable throwable) {
 
-      AsyncHandlerData data = getVirtualField().get(handler);
+      AsyncHandlerData data = virtualField().get(handler);
       if (data == null) {
         return null;
       }
-      getVirtualField().set(handler, null);
+      virtualField().set(handler, null);
       instrumenter().end(data.getContext(), data.getRequest(), null, throwable);
       return data.getParentContext().makeCurrent();
     }

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

@@ -8,13 +8,13 @@
 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.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;
 
 import io.opentelemetry.context.Context;
 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 javax.annotation.Nullable;
@@ -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.find(AsyncHandler.class, RequestContext.class).set(handler, requestContext);
+      virtualField().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

@@ -6,25 +6,34 @@
 package io.opentelemetry.javaagent.instrumentation.asynchttpclient.v2_0;
 
 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.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;
 
   static {
     INSTRUMENTER =
         JavaagentHttpClientInstrumenters.create(
             INSTRUMENTATION_NAME,
             new AsyncHttpClientHttpAttributesGetter(),
             HttpHeaderSetter.INSTANCE);
+
+    VIRTUAL_FIELD = VirtualField.find(AsyncHandler.class, RequestContext.class);
   }
 
   public static Instrumenter<RequestContext, Response> instrumenter() {
     return INSTRUMENTER;
   }
 
+  public static VirtualField<AsyncHandler<?>, RequestContext> virtualField() {
+    return VIRTUAL_FIELD;
+  }
+
   private AsyncHttpClientSingletons() {}
 }