Merge pull request #59 from appoptics/NH-21584-jdbc-instrumentation-fix

NH-21584: Decrease stack depth in early return branch
solarwinds · Sep 22, 2022 · 7b40e7c · 7b40e7c
2 parents 6349f9d + e0475d6
commit 7b40e7c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/.../java/com/appoptics/opentelemetry/instrumentation/AoPreparedStatementInstrumentation.java b/.../java/com/appoptics/opentelemetry/instrumentation/AoPreparedStatementInstrumentation.java
@@ -58,6 +58,7 @@ public static void onEnter(
             // is called - the first recursive Statement call is just skipped and we do not create a span
             // for it
             if (CallDepth.forClass(Statement.class).getAndIncrement() != 0) { //only report back when depth is one to avoid duplications
+                CallDepth.forClass(Statement.class).decrementAndGet();
                 return;
             }
             QueryArgsCollector.collect(currentContext(), index, value);
@@ -92,6 +93,9 @@ public static void onEnter(
         public static void onExit(
                 @Advice.Thrown Throwable throwable) {
             if (CallDepth.forClass(Statement.class).getAndIncrement() != 1) { //only report back when depth is one to avoid duplications
+                // Note that we need to decrement the call depth counter at every branch, otherwise the JDBC instrumentation of the
+                // Otel agent will break.
+                CallDepth.forClass(Statement.class).decrementAndGet();
                 return;
             }
             QueryArgsCollector.maybeAttach(currentContext());

diff --git a/...src/main/java/com/appoptics/opentelemetry/instrumentation/AoStatementInstrumentation.java b/...src/main/java/com/appoptics/opentelemetry/instrumentation/AoStatementInstrumentation.java
@@ -48,6 +48,9 @@ public static class StatementAdvice {
         @Advice.OnMethodEnter
         public static void onEnter(@Advice.Argument(value = 0, readOnly = false) String sql) {
             if (CallDepth.forClass(Statement.class).getAndIncrement() != 1) { //only report back when depth is one to avoid duplications
+                // Note that we need to decrement the call depth counter at every branch, otherwise the JDBC instrumentation of the
+                // Otel agent will break.
+                CallDepth.forClass(Statement.class).decrementAndGet();
                 return;
             }
             sql = TraceContextInjector.inject(currentContext(), sql);