Skip to content

Commit 45e9bc5

Browse files
authored
Do not parse DBInfo when no connection (#7800)
1 parent 9320a05 commit 45e9bc5

File tree

1 file changed

+7
-0
lines changed
  • dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc

1 file changed

+7
-0
lines changed

dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/JDBCDecorator.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,9 @@ public AgentSpan onConnection(final AgentSpan span, DBInfo dbInfo) {
145145

146146
public static DBInfo parseDBInfo(
147147
final Connection connection, ContextStore<Connection, DBInfo> contextStore) {
148+
if (connection == null) {
149+
return DBInfo.DEFAULT;
150+
}
148151
DBInfo dbInfo = contextStore.get(connection);
149152
/*
150153
* Logic to get the DBInfo from a JDBC Connection, if the connection was not created via
@@ -191,6 +194,10 @@ public String getDbService(final DBInfo dbInfo) {
191194
}
192195

193196
public static DBInfo parseDBInfoFromConnection(final Connection connection) {
197+
if (connection == null) {
198+
// we can log here, but it risks to be too verbose
199+
return DBInfo.DEFAULT;
200+
}
194201
DBInfo dbInfo;
195202
try {
196203
final DatabaseMetaData metaData = connection.getMetaData();

0 commit comments

Comments
 (0)