From fa29629d428e48634f4efa9be42ec097c8e3d275 Mon Sep 17 00:00:00 2001
From: Valentin Zakharov <valentin.zakharov1@gmail.com>
Date: Fri, 12 Jul 2024 00:10:17 +0200
Subject: [PATCH] Reset call depth counter if query is blocked

---
 .../trace/instrumentation/jdbc/StatementInstrumentation.java     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/StatementInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/StatementInstrumentation.java
index 20b513ab7d6..aee513deb7f 100644
--- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/StatementInstrumentation.java
+++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/StatementInstrumentation.java
@@ -120,6 +120,7 @@ public static AgentScope onEnter(
         // if we can't get the connection for any reason
         return null;
       } catch (BlockingException e) {
+        CallDepthThreadLocalMap.reset(Statement.class);
         // re-throw blocking exceptions
         throw e;
       } catch (Throwable e) {