change Exception to Throwable

nenadnoveljic · nenadnoveljic · commit 2675ae1381d3 · 2024-08-09T17:32:15.000+02:00
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
@@ -298,17 +298,13 @@ public long setContextInfo(Connection connection, DBInfo dbInfo) {
           e);
       DECORATE.onError(instrumentationSpan, e);
     } finally {
-      try {
-        instrumentationSpan.finish();
-      } catch (Exception e) {
-      } finally {
-        if (instrumentationStatement != null) {
-          try {
-            instrumentationStatement.close();
-          } catch (SQLException e) {
-          }
+      if (instrumentationStatement != null) {
+        try {
+          instrumentationStatement.close();
+        } catch (Throwable e) {
         }
       }
+      instrumentationSpan.finish();
     }
     return spanID;
   }

Original file line number	Diff line number	Diff line change
`@@ -298,17 +298,13 @@ public long setContextInfo(Connection connection, DBInfo dbInfo) {`
`298`	`298`	`e);`
`299`	`299`	`DECORATE.onError(instrumentationSpan, e);`
`300`	`300`	`} finally {`
`301`		`- try {`
`302`		`- instrumentationSpan.finish();`
`303`		`- } catch (Exception e) {`
`304`		`- } finally {`
`305`		`- if (instrumentationStatement != null) {`
`306`		`- try {`
`307`		`- instrumentationStatement.close();`
`308`		`- } catch (SQLException e) {`
`309`		`- }`
	`301`	`+ if (instrumentationStatement != null) {`
	`302`	`+ try {`
	`303`	`+ instrumentationStatement.close();`
	`304`	`+ } catch (Throwable e) {`
`310`	`305`	`}`
`311`	`306`	`}`
	`307`	`+ instrumentationSpan.finish();`
`312`	`308`	`}`
`313`	`309`	`return spanID;`
`314`	`310`	`}`