virtualfield 3

Author: SylvainJuge

instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-resteasy-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/ResteasyResourceLocatorInvokerInstrumentation.java

@@ -5,12 +5,12 @@
 
 package io.opentelemetry.javaagent.instrumentation.jaxrs.v3_0;
 
+import static io.opentelemetry.javaagent.instrumentation.jaxrs.v3_0.ResteasySingletons.LOCATOR_NAME;
 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.bootstrap.Java8BytecodeBridge;
 import io.opentelemetry.javaagent.bootstrap.jaxrs.JaxrsContextPath;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
@@ -47,8 +47,7 @@ public static Scope onEnter(@Advice.This ResourceLocatorInvoker resourceInvoker)
 
       Context currentContext = Java8BytecodeBridge.currentContext();
 
-      String name =
-          VirtualField.find(ResourceLocatorInvoker.class, String.class).get(resourceInvoker);
+      String name = LOCATOR_NAME.get(resourceInvoker);
       ResteasySpanName.INSTANCE.updateServerSpanName(currentContext, name);
 
       // subresource locator returns a resources class that may have @Path annotations

instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-resteasy-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/ResteasyResourceMethodInvokerInstrumentation.java

@@ -5,10 +5,10 @@
 
 package io.opentelemetry.javaagent.instrumentation.jaxrs.v3_0;
 
+import static io.opentelemetry.javaagent.instrumentation.jaxrs.v3_0.ResteasySingletons.INVOKER_NAME;
 import static net.bytebuddy.matcher.ElementMatchers.named;
 import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
 
-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;
@@ -39,8 +39,7 @@ public static class InvokeOnTargetAdvice {
     @Advice.OnMethodEnter(suppress = Throwable.class)
     public static void onEnter(@Advice.This ResourceMethodInvoker resourceInvoker) {
 
-      String name =
-          VirtualField.find(ResourceMethodInvoker.class, String.class).get(resourceInvoker);
+      String name = INVOKER_NAME.get(resourceInvoker);
       ResteasySpanName.INSTANCE.updateServerSpanName(Java8BytecodeBridge.currentContext(), name);
     }
   }

instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-resteasy-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/ResteasyRootNodeTypeInstrumentation.java

@@ -5,11 +5,12 @@
 
 package io.opentelemetry.javaagent.instrumentation.jaxrs.v3_0;
 
+import static io.opentelemetry.javaagent.instrumentation.jaxrs.v3_0.ResteasySingletons.INVOKER_NAME;
+import static io.opentelemetry.javaagent.instrumentation.jaxrs.v3_0.ResteasySingletons.LOCATOR_NAME;
 import static net.bytebuddy.matcher.ElementMatchers.named;
 import static net.bytebuddy.matcher.ElementMatchers.namedOneOf;
 import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
 
-import io.opentelemetry.instrumentation.api.util.VirtualField;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
 import io.opentelemetry.javaagent.instrumentation.jaxrs.JaxrsPathUtil;
@@ -51,12 +52,10 @@ public static void addInvoker(
       String normalizedPath = JaxrsPathUtil.normalizePath(path);
       if (invoker instanceof ResourceLocatorInvoker) {
         ResourceLocatorInvoker resourceLocatorInvoker = (ResourceLocatorInvoker) invoker;
-        VirtualField.find(ResourceLocatorInvoker.class, String.class)
-            .set(resourceLocatorInvoker, normalizedPath);
+        LOCATOR_NAME.set(resourceLocatorInvoker, normalizedPath);
       } else if (invoker instanceof ResourceMethodInvoker) {
         ResourceMethodInvoker resourceMethodInvoker = (ResourceMethodInvoker) invoker;
-        VirtualField.find(ResourceMethodInvoker.class, String.class)
-            .set(resourceMethodInvoker, normalizedPath);
+        INVOKER_NAME.set(resourceMethodInvoker, normalizedPath);
       }
     }
   }

instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-resteasy-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/ResteasySingletons.java

@@ -6,14 +6,23 @@
 package io.opentelemetry.javaagent.instrumentation.jaxrs.v3_0;
 
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
+import io.opentelemetry.instrumentation.api.util.VirtualField;
 import io.opentelemetry.javaagent.instrumentation.jaxrs.HandlerData;
 import io.opentelemetry.javaagent.instrumentation.jaxrs.JaxrsInstrumenterFactory;
+import org.jboss.resteasy.core.ResourceLocatorInvoker;
+import org.jboss.resteasy.core.ResourceMethodInvoker;
 
 public final class ResteasySingletons {
 
   private static final Instrumenter<HandlerData, Void> INSTANCE =
       JaxrsInstrumenterFactory.createInstrumenter("io.opentelemetry.jaxrs-3.0-resteasy-6.0");
 
+  public static final VirtualField<ResourceMethodInvoker, String> INVOKER_NAME =
+      VirtualField.find(ResourceMethodInvoker.class, String.class);
+
+  public static final VirtualField<ResourceLocatorInvoker, String> LOCATOR_NAME =
+      VirtualField.find(ResourceLocatorInvoker.class, String.class);
+
   public static Instrumenter<HandlerData, Void> instrumenter() {
     return INSTANCE;
   }