Skip to content

Commit 23ef6fd

Browse files
committed
Fix DBMInjectionForkedTest
1 parent 222192e commit 23ef6fd

File tree

1 file changed

+19
-17
lines changed

1 file changed

+19
-17
lines changed

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

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -111,24 +111,26 @@ public static String onEnter(
111111
@Advice.This Connection connection,
112112
@Advice.Argument(value = 0, readOnly = false) String sql) {
113113
// Using INJECT_COMMENT fails to update when a test calls injectSysConfig
114-
if (DECORATE.shouldInjectSQLComment()) {
115-
final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(Connection.class);
116-
if (callDepth > 0) {
117-
return null;
118-
}
119-
final DBInfo dbInfo =
120-
JDBCDecorator.parseDBInfo(
121-
connection, InstrumentationContext.get(Connection.class, DBInfo.class));
122-
String dbService = DECORATE.getDbService(dbInfo);
123-
if (dbService != null) {
124-
dbService =
125-
traceConfig(activeSpan()).getServiceMapping().getOrDefault(dbService, dbService);
126-
}
127-
boolean append = "sqlserver".equals(dbInfo.getType());
128-
return SQLCommenter.inject(
129-
sql, dbService, dbInfo.getType(), dbInfo.getHost(), dbInfo.getDb(), null, append);
114+
if (!DECORATE.shouldInjectSQLComment()) {
115+
return sql;
130116
}
131-
return sql;
117+
if (CallDepthThreadLocalMap.incrementCallDepth(Connection.class) > 0) {
118+
return null;
119+
}
120+
final String inputSql = sql;
121+
final DBInfo dbInfo =
122+
JDBCDecorator.parseDBInfo(
123+
connection, InstrumentationContext.get(Connection.class, DBInfo.class));
124+
String dbService = DECORATE.getDbService(dbInfo);
125+
if (dbService != null) {
126+
dbService =
127+
traceConfig(activeSpan()).getServiceMapping().getOrDefault(dbService, dbService);
128+
}
129+
boolean append = "sqlserver".equals(dbInfo.getType());
130+
sql =
131+
SQLCommenter.inject(
132+
sql, dbService, dbInfo.getType(), dbInfo.getHost(), dbInfo.getDb(), null, append);
133+
return inputSql;
132134
}
133135

134136
@Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)

0 commit comments

Comments
 (0)