Skip to content

Write base hash to current span when injected in DBM comment #10450

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

Open
vandonr wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Write base hash to current span when injected in DBM comment #10450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b8fab5
write base hash to current span when injected in DBM comment
vandonr Jan 27, 2026
b01fb29
check activespan for null
vandonr Jan 27, 2026
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
17 changes: 15 additions & 2 deletions .../main/java/datadog/trace/instrumentation/jdbc/DBMCompatibleConnectionInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,13 @@
import com.google.auto.service.AutoService;
import datadog.trace.agent.tooling.Instrumenter;
import datadog.trace.agent.tooling.InstrumenterModule;
import datadog.trace.api.BaseHash;
import datadog.trace.api.Config;
import datadog.trace.bootstrap.CallDepthThreadLocalMap;
import datadog.trace.bootstrap.ContextStore;
import datadog.trace.bootstrap.InstrumentationContext;
import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
import datadog.trace.bootstrap.instrumentation.api.Tags;
import datadog.trace.bootstrap.instrumentation.jdbc.DBInfo;
import datadog.trace.bootstrap.instrumentation.jdbc.DBQueryInfo;
import java.sql.Connection;
Expand Down Expand Up @@ -121,20 +125,29 @@ public static String onEnter(
return null;
}
final String inputSql = sql;
final AgentSpan activeSpan = activeSpan();
final DBInfo dbInfo =
JDBCDecorator.parseDBInfo(
connection, InstrumentationContext.get(Connection.class, DBInfo.class));
String dbService = DECORATE.getDbService(dbInfo);
if (dbService != null) {
dbService =
traceConfig(activeSpan()).getServiceMapping().getOrDefault(dbService, dbService);
dbService = traceConfig(activeSpan).getServiceMapping().getOrDefault(dbService, dbService);
}

boolean append =
DECORATE.DBM_ALWAYS_APPEND_SQL_COMMENT || "sqlserver".equals(dbInfo.getType());
String originalSql = sql;
sql =
SQLCommenter.inject(
sql, dbService, dbInfo.getType(), dbInfo.getHost(), dbInfo.getDb(), null, append);
if (sql != originalSql // intentional reference comparison to check if injection happened
&& activeSpan != null
&& Config.get().isDbmInjectSqlBaseHash()
&& Config.get().isExperimentalPropagateProcessTagsEnabled()) {
// if the base hash was injected in the comment, we need to write it to the span as well,
// so that the query and the span can be re-matched in the backed
activeSpan.setTag(Tags.BASE_HASH, BaseHash.getBaseHashStr());
}
return inputSql;
}

Expand Down
1 change: 1 addition & 0 deletions internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/Tags.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ public class Tags {
public static final String DB_SCHEMA = "db.schema";
public static final String MESSAGE_BUS_DESTINATION = "message_bus.destination";
public static final String DB_POOL_NAME = "db.pool.name";
public static final String BASE_HASH = "_dd.propagated_hash";

public static final String TEST_SESSION_NAME = "test_session.name";
public static final String TEST_MODULE = "test.module";
Expand Down