Fix: injected bytecode shouldn't link back to instrumentation class

Thanks to @mcculls for pointing out the issue.

Author: deejgregor

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

@@ -50,7 +50,7 @@ public void methodAdvice(MethodTransformer transformer) {
   public static class PollFirstAdvice {
     @Advice.OnMethodEnter(suppress = Throwable.class)
     public static AgentSpan onEnter() {
-      if (CallDepthThreadLocalMap.getCallDepth(Dbcp2LinkedBlockingDequeInstrumentation.class) > 0) {
+      if (CallDepthThreadLocalMap.getCallDepth(PoolWaitingDecorator.class) > 0) {
         AgentSpan span = startSpan(POOL_WAITING);
         DECORATE.afterStart(span);
         span.setResourceName("dbcp2.waiting");

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

@@ -30,6 +30,11 @@ public String[] knownMatchingTypes() {
     };
   }
 
+  @Override
+  public String[] helperClassNames() {
+    return new String[] {packageName + ".PoolWaitingDecorator"};
+  }
+
   @Override
   public void methodAdvice(MethodTransformer transformer) {
     transformer.applyAdvice(
@@ -40,12 +45,12 @@ public void methodAdvice(MethodTransformer transformer) {
   public static class UpdateTransactionStatusAdvice {
     @Advice.OnMethodEnter(suppress = Throwable.class)
     public static void onEnter() {
-      CallDepthThreadLocalMap.incrementCallDepth(Dbcp2LinkedBlockingDequeInstrumentation.class);
+      CallDepthThreadLocalMap.incrementCallDepth(PoolWaitingDecorator.class);
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
     public static void onExit() {
-      CallDepthThreadLocalMap.decrementCallDepth(Dbcp2LinkedBlockingDequeInstrumentation.class);
+      CallDepthThreadLocalMap.decrementCallDepth(PoolWaitingDecorator.class);
     }
   }
 }

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

@@ -30,6 +30,11 @@ public String[] knownMatchingTypes() {
     };
   }
 
+  @Override
+  public String[] helperClassNames() {
+    return new String[] {packageName + ".PoolWaitingDecorator"};
+  }
+
   @Override
   public void methodAdvice(MethodTransformer transformer) {
     transformer.applyAdvice(
@@ -41,12 +46,12 @@ public void methodAdvice(MethodTransformer transformer) {
   public static class GetPooledConnectionAndInfoAdvice {
     @Advice.OnMethodEnter(suppress = Throwable.class)
     public static void onEnter() {
-      CallDepthThreadLocalMap.incrementCallDepth(Dbcp2LinkedBlockingDequeInstrumentation.class);
+      CallDepthThreadLocalMap.incrementCallDepth(PoolWaitingDecorator.class);
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
     public static void onExit() {
-      CallDepthThreadLocalMap.decrementCallDepth(Dbcp2LinkedBlockingDequeInstrumentation.class);
+      CallDepthThreadLocalMap.decrementCallDepth(PoolWaitingDecorator.class);
     }
   }
 }

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

@@ -30,6 +30,11 @@ public String[] knownMatchingTypes() {
     };
   }
 
+  @Override
+  public String[] helperClassNames() {
+    return new String[] {packageName + ".PoolWaitingDecorator"};
+  }
+
   @Override
   public void methodAdvice(MethodTransformer transformer) {
     transformer.applyAdvice(
@@ -40,12 +45,12 @@ public void methodAdvice(MethodTransformer transformer) {
   public static class GetConnectionAdvice {
     @Advice.OnMethodEnter(suppress = Throwable.class)
     public static void onEnter() {
-      CallDepthThreadLocalMap.incrementCallDepth(Dbcp2LinkedBlockingDequeInstrumentation.class);
+      CallDepthThreadLocalMap.incrementCallDepth(PoolWaitingDecorator.class);
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
     public static void onExit() {
-      CallDepthThreadLocalMap.decrementCallDepth(Dbcp2LinkedBlockingDequeInstrumentation.class);
+      CallDepthThreadLocalMap.decrementCallDepth(PoolWaitingDecorator.class);
     }
   }
 }

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

@@ -30,6 +30,11 @@ public String[] knownMatchingTypes() {
     };
   }
 
+  @Override
+  public String[] helperClassNames() {
+    return new String[] {packageName + ".PoolWaitingDecorator"};
+  }
+
   @Override
   public void methodAdvice(MethodTransformer transformer) {
     transformer.applyAdvice(
@@ -39,12 +44,12 @@ public void methodAdvice(MethodTransformer transformer) {
   public static class ConnectAdvice {
     @Advice.OnMethodEnter(suppress = Throwable.class)
     public static void onEnter() {
-      CallDepthThreadLocalMap.incrementCallDepth(Dbcp2LinkedBlockingDequeInstrumentation.class);
+      CallDepthThreadLocalMap.incrementCallDepth(PoolWaitingDecorator.class);
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
     public static void onExit() {
-      CallDepthThreadLocalMap.decrementCallDepth(Dbcp2LinkedBlockingDequeInstrumentation.class);
+      CallDepthThreadLocalMap.decrementCallDepth(PoolWaitingDecorator.class);
     }
   }
 }

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

@@ -30,6 +30,11 @@ public String[] knownMatchingTypes() {
     };
   }
 
+  @Override
+  public String[] helperClassNames() {
+    return new String[] {packageName + ".PoolWaitingDecorator"};
+  }
+
   @Override
   public void methodAdvice(MethodTransformer transformer) {
     transformer.applyAdvice(
@@ -41,12 +46,12 @@ public void methodAdvice(MethodTransformer transformer) {
   public static class GetPooledConnectionAndInfoAdvice {
     @Advice.OnMethodEnter(suppress = Throwable.class)
     public static void onEnter() {
-      CallDepthThreadLocalMap.incrementCallDepth(Dbcp2LinkedBlockingDequeInstrumentation.class);
+      CallDepthThreadLocalMap.incrementCallDepth(PoolWaitingDecorator.class);
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
     public static void onExit() {
-      CallDepthThreadLocalMap.decrementCallDepth(Dbcp2LinkedBlockingDequeInstrumentation.class);
+      CallDepthThreadLocalMap.decrementCallDepth(PoolWaitingDecorator.class);
     }
   }
 }