Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix JDBC instrumentation deadlock #4191

Merged
merged 1 commit into from
Sep 23, 2021
Merged

Fix JDBC instrumentation deadlock #4191

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion .../jdbc/library/src/main/java/io/opentelemetry/instrumentation/jdbc/internal/JdbcUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down