Merge pull request #7405 from DataDog/nenadnoveljic/sqlserver-fix-exception-handling

nenadnoveljic · web-flow · commit 0e0a715784bd · 2024-08-12T09:31:04.000+02:00
Fix exception handling for SQL Server full mode
diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/JDBCDecorator.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/JDBCDecorator.java
@@ -301,7 +301,7 @@ public long setContextInfo(Connection connection, DBInfo dbInfo) {
       if (instrumentationStatement != null) {
         try {
           instrumentationStatement.close();
-        } catch (Exception e) {
+        } catch (Throwable e) {
         }
       }
       instrumentationSpan.finish();

Original file line number	Diff line number	Diff line change
`@@ -301,7 +301,7 @@ public long setContextInfo(Connection connection, DBInfo dbInfo) {`
`301`	`301`	`if (instrumentationStatement != null) {`
`302`	`302`	`try {`
`303`	`303`	`instrumentationStatement.close();`
`304`		`- } catch (Exception e) {`
	`304`	`+ } catch (Throwable e) {`
`305`	`305`	`}`
`306`	`306`	`}`
`307`	`307`	`instrumentationSpan.finish();`