Fix JDBC instrumentation deadlock (#4191)

open-telemetry · Sep 29, 2021 · 3539019 · 3539019
1 parent 15cfcfa
commit 3539019
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/.../jdbc/library/src/main/java/io/opentelemetry/instrumentation/jdbc/internal/JdbcUtils.java b/.../jdbc/library/src/main/java/io/opentelemetry/instrumentation/jdbc/internal/JdbcUtils.java
@@ -65,7 +65,16 @@ public static Connection connectionFromStatement(Statement statement) {
   }
 
   public static DbInfo extractDbInfo(Connection connection) {
-    return JdbcData.connectionInfo.computeIfAbsent(connection, JdbcUtils::computeDbInfo);
+    // intentionally not using computeIfAbsent() since that would perform computeDbInfo() under a
+    // lock, and computeDbInfo() calls back to the application code via Connection.getMetaData()
+    // which could then result in a deadlock
+    // (e.g. https://github.com/open-telemetry/opentelemetry-java-instrumentation/issues/4188)
+    DbInfo dbInfo = JdbcData.connectionInfo.get(connection);
+    if (dbInfo == null) {
+      dbInfo = computeDbInfo(connection);
+      JdbcData.connectionInfo.put(connection, dbInfo);
+    }
+    return dbInfo;
   }
 
   public static DbInfo computeDbInfo(Connection connection) {