move virtualfield for simplicity

Author: SylvainJuge

instrumentation/rmi/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rmi/context/ContextPropagator.java

@@ -22,6 +22,9 @@ public class ContextPropagator {
 
   private static final Logger logger = Logger.getLogger(ContextPropagator.class.getName());
 
+  private static final VirtualField<Connection, Boolean> KNOWN_CONNECTION =
+      VirtualField.find(Connection.class, Boolean.class);
+
   // Internal RMI object ids that we don't want to trace
   private static final ObjID ACTIVATOR_ID = new ObjID(ObjID.ACTIVATOR_ID);
   private static final ObjID DGC_ID = new ObjID(ObjID.DGC_ID);
@@ -48,24 +51,22 @@ public boolean isOperationWithPayload(int operationId) {
     return operationId == CONTEXT_PAYLOAD_OPERATION_ID;
   }
 
-  public void attemptToPropagateContext(
-      VirtualField<Connection, Boolean> knownConnections, Connection c, Context context) {
-    if (checkIfContextCanBePassed(knownConnections, c)) {
+  public void attemptToPropagateContext(Connection c, Context context) {
+    if (checkIfContextCanBePassed(c)) {
       if (!syntheticCall(c, ContextPayload.from(context), CONTEXT_PAYLOAD_OPERATION_ID)) {
         logger.fine("Couldn't send context payload");
       }
     }
   }
 
-  private static boolean checkIfContextCanBePassed(
-      VirtualField<Connection, Boolean> knownConnections, Connection c) {
-    Boolean storedResult = knownConnections.get(c);
+  private static boolean checkIfContextCanBePassed(Connection c) {
+    Boolean storedResult = KNOWN_CONNECTION.get(c);
     if (storedResult != null) {
       return storedResult;
     }
 
     boolean result = syntheticCall(c, null, CONTEXT_CHECK_CALL_OPERATION_ID);
-    knownConnections.set(c, result);
+    KNOWN_CONNECTION.set(c, result);
     return result;
   }
 

instrumentation/rmi/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rmi/context/client/RmiClientContextInstrumentation.java

@@ -6,7 +6,6 @@
 package io.opentelemetry.javaagent.instrumentation.rmi.context.client;
 
 import static io.opentelemetry.javaagent.instrumentation.rmi.context.ContextPropagator.PROPAGATOR;
-import static io.opentelemetry.javaagent.instrumentation.rmi.context.client.VirtualFieldHelper.KNOWN_CONNECTION;
 import static net.bytebuddy.matcher.ElementMatchers.isConstructor;
 import static net.bytebuddy.matcher.ElementMatchers.named;
 import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
@@ -77,7 +76,7 @@ public static void onEnter(@Advice.Argument(0) Connection c, @Advice.Argument(1)
       }
 
       // caching if a connection can support enhanced format
-      PROPAGATOR.attemptToPropagateContext(KNOWN_CONNECTION, c, currentContext);
+      PROPAGATOR.attemptToPropagateContext(c, currentContext);
     }
   }
 }