Do not leak call depth threadlocal in jdbc instrumentation (#7468)

amarziali · web-flow · commit 5ae921b9c4cf · 2024-08-19T11:28:53.000+02:00
diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/AbstractPreparedStatementInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/AbstractPreparedStatementInstrumentation.java
@@ -102,14 +102,14 @@ public static AgentScope onEnter(@Advice.This final Statement statement) {
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
     public static void stopSpan(
         @Advice.Enter final AgentScope scope, @Advice.Thrown final Throwable throwable) {
+      CallDepthThreadLocalMap.decrementCallDepth(Statement.class);
       if (scope == null) {
         return;
       }
       DECORATE.onError(scope.span(), throwable);
       DECORATE.beforeFinish(scope.span());
       scope.close();
       scope.span().finish();
-      CallDepthThreadLocalMap.reset(Statement.class);
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -102,14 +102,14 @@ public static AgentScope onEnter(@Advice.This final Statement statement) {`
`102`	`102`	`@Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)`
`103`	`103`	`public static void stopSpan(`
`104`	`104`	`@Advice.Enter final AgentScope scope, @Advice.Thrown final Throwable throwable) {`
	`105`	`+ CallDepthThreadLocalMap.decrementCallDepth(Statement.class);`
`105`	`106`	`if (scope == null) {`
`106`	`107`	`return;`
`107`	`108`	`}`
`108`	`109`	`DECORATE.onError(scope.span(), throwable);`
`109`	`110`	`DECORATE.beforeFinish(scope.span());`
`110`	`111`	`scope.close();`
`111`	`112`	`scope.span().finish();`
`112`		`- CallDepthThreadLocalMap.reset(Statement.class);`
`113`	`113`	`}`
`114`	`114`	`}`
`115`	`115`	`}`