Fix JDBC muzzle: avoid defining helper classes as inner classes of instrumentations (#10106)

Author: mcculls

dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/HikariBlockedTrackingSynchronousQueue.java

@@ -0,0 +1,17 @@
+package datadog.trace.instrumentation.jdbc;
+
+import java.util.concurrent.SynchronousQueue;
+import java.util.concurrent.TimeUnit;
+
+public class HikariBlockedTrackingSynchronousQueue<T> extends SynchronousQueue<T> {
+  public HikariBlockedTrackingSynchronousQueue() {
+    // This assumes the initialization of the SynchronousQueue in ConcurrentBag doesn't change
+    super(true);
+  }
+
+  @Override
+  public T poll(long timeout, TimeUnit unit) throws InterruptedException {
+    HikariBlockedTracker.setBlocked();
+    return super.poll(timeout, unit);
+  }
+}

dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/HikariConcurrentBagHandoffQueueInstrumentation.java

@@ -9,7 +9,6 @@
 import datadog.trace.agent.tooling.InstrumenterModule;
 import datadog.trace.api.InstrumenterConfig;
 import java.util.concurrent.SynchronousQueue;
-import java.util.concurrent.TimeUnit;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
@@ -46,9 +45,7 @@ public ElementMatcher<TypeDescription> structureMatcher() {
   @Override
   public String[] helperClassNames() {
     return new String[] {
-      packageName + ".HikariBlockedTracker",
-      packageName
-          + ".HikariConcurrentBagHandoffQueueInstrumentation$BlockedTrackingSynchronousQueue",
+      packageName + ".HikariBlockedTracker", packageName + ".HikariBlockedTrackingSynchronousQueue",
     };
   }
 
@@ -64,20 +61,7 @@ public static class ConstructorAdvice {
     static void after(
         @Advice.FieldValue(value = "handoffQueue", readOnly = false)
             SynchronousQueue handoffQueue) {
-      handoffQueue = new BlockedTrackingSynchronousQueue<>();
-    }
-  }
-
-  public static class BlockedTrackingSynchronousQueue<T> extends SynchronousQueue<T> {
-    public BlockedTrackingSynchronousQueue() {
-      // This assumes the initialization of the SynchronousQueue in ConcurrentBag doesn't change
-      super(true);
-    }
-
-    @Override
-    public T poll(long timeout, TimeUnit unit) throws InterruptedException {
-      HikariBlockedTracker.setBlocked();
-      return super.poll(timeout, unit);
+      handoffQueue = new HikariBlockedTrackingSynchronousQueue<>();
     }
   }
 }