Move VirtualField.find() out of advice in CommandSchedulerInstrumentation

VirtualField.find() cannot be called directly in advice methods (fails the
VirtualFieldChecker in indy mode). Move the VirtualField to a static field
in VertxSqlClientSingletons and expose getCommandContext/setCommandContext
helper methods that the advice calls instead.

Author: trask

instrumentation/vertx/vertx-sql-client/vertx-sql-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v5_0/sql/CommandSchedulerInstrumentation.java

@@ -6,12 +6,13 @@
 package io.opentelemetry.javaagent.instrumentation.vertx.v5_0.sql;
 
 import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.implementsInterface;
+import static io.opentelemetry.javaagent.instrumentation.vertx.v5_0.sql.VertxSqlClientSingletons.getCommandContext;
+import static io.opentelemetry.javaagent.instrumentation.vertx.v5_0.sql.VertxSqlClientSingletons.setCommandContext;
 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 io.vertx.sqlclient.internal.command.CommandBase;
@@ -49,20 +50,17 @@ public void transform(TypeTransformer transformer) {
         CommandSchedulerInstrumentation.class.getName() + "$ScheduleAdvice");
   }
 
-  // VirtualField.find requires the raw type; CommandBase is invoked reflectively by ByteBuddy
-  @SuppressWarnings({"unused", "rawtypes"})
+  @SuppressWarnings("unused")
   public static class ScheduleAdvice {
 
     @Advice.OnMethodEnter(suppress = Throwable.class)
     @Nullable
     public static Scope onEnter(@Advice.Argument(0) CommandBase<?> command) {
-      VirtualField<CommandBase, Context> contextField =
-          VirtualField.find(CommandBase.class, Context.class);
-      Context stored = contextField.get(command);
+      Context stored = getCommandContext(command);
       if (stored == null) {
         // First schedule call (query executor → pool or direct connection).
         // The current OpenTelemetry context is correct — store it on the command.
-        contextField.set(command, Context.current());
+        setCommandContext(command, Context.current());
         return null;
       }
       // Subsequent schedule call (pool → connection).

instrumentation/vertx/vertx-sql-client/vertx-sql-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v5_0/sql/VertxSqlClientSingletons.java

@@ -7,6 +7,7 @@
 
 import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DbSystemNameIncubatingValues.OTHER_SQL;
 
+import io.opentelemetry.context.Context;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
 import io.opentelemetry.instrumentation.api.util.VirtualField;
 import io.opentelemetry.javaagent.instrumentation.vertx.sql.VertxSqlClientRequest;
@@ -16,6 +17,7 @@
 import io.vertx.sqlclient.SqlConnectOptions;
 import io.vertx.sqlclient.SqlConnection;
 import io.vertx.sqlclient.internal.SqlClientBase;
+import io.vertx.sqlclient.internal.command.CommandBase;
 
 public final class VertxSqlClientSingletons {
   private static final String INSTRUMENTATION_NAME = "io.opentelemetry.vertx-sql-client-5.0";
@@ -35,6 +37,23 @@ public static Instrumenter<VertxSqlClientRequest, Void> instrumenter() {
   private static final VirtualField<SqlClientBase, SqlConnectOptions> connectOptionsField =
       VirtualField.find(SqlClientBase.class, SqlConnectOptions.class);
 
+  // CommandBase is a generic type; VirtualField.find requires the raw type
+  @SuppressWarnings("rawtypes")
+  private static final VirtualField<CommandBase, Context> commandContextField =
+      VirtualField.find(CommandBase.class, Context.class);
+
+  // CommandBase is a generic type used as VirtualField key
+  @SuppressWarnings("rawtypes")
+  public static Context getCommandContext(CommandBase<?> command) {
+    return commandContextField.get(command);
+  }
+
+  // CommandBase is a generic type used as VirtualField key
+  @SuppressWarnings("rawtypes")
+  public static void setCommandContext(CommandBase<?> command, Context context) {
+    commandContextField.set(command, context);
+  }
+
   public static void storePoolDbSystem(Pool pool, String dbSystem) {
     poolDbSystem.set(pool, dbSystem);
   }