virtualfield 1

Author: SylvainJuge

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/JaxrsAnnotationsInstrumentation.java

@@ -7,6 +7,7 @@
 
 import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasSuperMethod;
 import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasSuperType;
+import static io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.JaxrsAnnotationsSingletons.ASYNC_RESPONSE_DATA;
 import static io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.JaxrsAnnotationsSingletons.instrumenter;
 import static net.bytebuddy.matcher.ElementMatchers.declaresMethod;
 import static net.bytebuddy.matcher.ElementMatchers.isAnnotatedWith;
@@ -21,7 +22,6 @@
 import io.opentelemetry.context.Scope;
 import io.opentelemetry.instrumentation.api.semconv.http.HttpServerRoute;
 import io.opentelemetry.instrumentation.api.semconv.http.HttpServerRouteSource;
-import io.opentelemetry.instrumentation.api.util.VirtualField;
 import io.opentelemetry.javaagent.bootstrap.CallDepth;
 import io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
@@ -89,12 +89,10 @@ public AdviceScope enter(Object[] args, Object target, Method method) {
           return this;
         }
 
-        VirtualField<AsyncResponse, AsyncResponseData> virtualField = null;
         for (Object arg : args) {
           if (arg instanceof AsyncResponse) {
             asyncResponse = (AsyncResponse) arg;
-            virtualField = VirtualField.find(AsyncResponse.class, AsyncResponseData.class);
-            if (virtualField.get(asyncResponse) != null) {
+            if (ASYNC_RESPONSE_DATA.get(asyncResponse) != null) {
               /*
                * We are probably in a recursive call and don't want to start a new span because it
                * would replace the existing span in the asyncResponse and cause it to never finish. We
@@ -123,8 +121,8 @@ public AdviceScope enter(Object[] args, Object target, Method method) {
         context = instrumenter().start(parentContext, handlerData);
         scope = context.makeCurrent();
 
-        if (virtualField != null && asyncResponse != null) {
-          virtualField.set(asyncResponse, AsyncResponseData.create(context, handlerData));
+        if (ASYNC_RESPONSE_DATA != null && asyncResponse != null) {
+          ASYNC_RESPONSE_DATA.set(asyncResponse, AsyncResponseData.create(context, handlerData));
         }
         return this;
       }

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/JaxrsAnnotationsSingletons.java

@@ -6,8 +6,11 @@
 package io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0;
 
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
+import io.opentelemetry.instrumentation.api.util.VirtualField;
+import io.opentelemetry.javaagent.instrumentation.jaxrs.AsyncResponseData;
 import io.opentelemetry.javaagent.instrumentation.jaxrs.HandlerData;
 import io.opentelemetry.javaagent.instrumentation.jaxrs.JaxrsInstrumenterFactory;
+import javax.ws.rs.container.AsyncResponse;
 
 public final class JaxrsAnnotationsSingletons {
 
@@ -18,5 +21,8 @@ public static Instrumenter<HandlerData, Void> instrumenter() {
     return INSTANCE;
   }
 
+  public static final VirtualField<AsyncResponse, AsyncResponseData> ASYNC_RESPONSE_DATA =
+      VirtualField.find(AsyncResponse.class, AsyncResponseData.class);
+
   private JaxrsAnnotationsSingletons() {}
 }

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/JaxrsAsyncResponseInstrumentation.java

@@ -7,13 +7,13 @@
 
 import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
 import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.implementsInterface;
+import static io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.JaxrsAnnotationsSingletons.ASYNC_RESPONSE_DATA;
 import static io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.JaxrsAnnotationsSingletons.instrumenter;
 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.instrumentation.api.util.VirtualField;
 import io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
@@ -55,12 +55,9 @@ public static class AsyncResponseAdvice {
     @Advice.OnMethodExit(suppress = Throwable.class)
     public static void stopSpan(@Advice.This AsyncResponse asyncResponse) {
 
-      VirtualField<AsyncResponse, AsyncResponseData> virtualField =
-          VirtualField.find(AsyncResponse.class, AsyncResponseData.class);
-
-      AsyncResponseData data = virtualField.get(asyncResponse);
+      AsyncResponseData data = ASYNC_RESPONSE_DATA.get(asyncResponse);
       if (data != null) {
-        virtualField.set(asyncResponse, null);
+        ASYNC_RESPONSE_DATA.set(asyncResponse, null);
         instrumenter().end(data.getContext(), data.getHandlerData(), null, null);
       }
     }
@@ -73,12 +70,9 @@ public static class AsyncResponseThrowableAdvice {
     public static void stopSpan(
         @Advice.This AsyncResponse asyncResponse, @Advice.Argument(0) Throwable throwable) {
 
-      VirtualField<AsyncResponse, AsyncResponseData> virtualField =
-          VirtualField.find(AsyncResponse.class, AsyncResponseData.class);
-
-      AsyncResponseData data = virtualField.get(asyncResponse);
+      AsyncResponseData data = ASYNC_RESPONSE_DATA.get(asyncResponse);
       if (data != null) {
-        virtualField.set(asyncResponse, null);
+        ASYNC_RESPONSE_DATA.set(asyncResponse, null);
         instrumenter().end(data.getContext(), data.getHandlerData(), null, throwable);
       }
     }
@@ -90,12 +84,9 @@ public static class AsyncResponseCancelAdvice {
     @Advice.OnMethodEnter(suppress = Throwable.class)
     public static void stopSpan(@Advice.This AsyncResponse asyncResponse) {
 
-      VirtualField<AsyncResponse, AsyncResponseData> virtualField =
-          VirtualField.find(AsyncResponse.class, AsyncResponseData.class);
-
-      AsyncResponseData data = virtualField.get(asyncResponse);
+      AsyncResponseData data = ASYNC_RESPONSE_DATA.get(asyncResponse);
       if (data != null) {
-        virtualField.set(asyncResponse, null);
+        ASYNC_RESPONSE_DATA.set(asyncResponse, null);
         Context context = data.getContext();
         if (JaxrsConfig.CAPTURE_EXPERIMENTAL_SPAN_ATTRIBUTES) {
           Java8BytecodeBridge.spanFromContext(context).setAttribute("jaxrs.canceled", true);