Skip to content

Container hash tags propagation #9282

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
wants to merge 15 commits into
base: master
Choose a base branch
from
+458 −530
Open

Container hash tags propagation #9282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
9f5d390
Populate the base hash with the container tag hash if the process tag…
ygree Jul 30, 2025
c7a35b2
DBM: Inject DD_SERVICE_HASH
ygree Jul 30, 2025
d199ffd
Remove the useless benchmark that only measures adding strings to a s…
ygree Aug 13, 2025
0e28803
Clean up the unnecessary complexity of SQLCommenter and add a few fixes
ygree Aug 13, 2025
bc7eefb
Use the predefined comment buffer capacity instead of calculating it …
ygree Aug 13, 2025
1992f14
Fix the check to see if a comment has already been injected.
ygree Aug 13, 2025
e0a0a1a
Preallocate string builder in bash hash calc
ygree Aug 13, 2025
8eb36bc
Merge branch 'master' into ygree/container-tags-hash-propagation
ygree Aug 13, 2025
b27ca85
Introduce DB_DBM_INJECT_SQL_BASEHASH
ygree Aug 14, 2025
620c3ba
Merge branch 'master' into ygree/container-tags-hash-propagation
ygree Aug 14, 2025
f9bf045
Clean up hashOfKnownTags leftovers #9151
ygree Aug 18, 2025
c729865
BaseHash keeps a global hash that is updated when containerTagsHash i…
ygree Aug 19, 2025
2fcea15
Merge branch 'master' into ygree/container-tags-hash-propagation
ygree Aug 19, 2025
cc9835e
Merge branch 'master' into ygree/container-tags-hash-propagation
ygree Aug 29, 2025
ac2eb86
Sync when update containerTagsHash
ygree Aug 29, 2025
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
12 changes: 11 additions & 1 deletion communication/src/main/java/datadog/communication/ddagent/DDAgentFeaturesDiscovery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import datadog.communication.monitor.DDAgentStatsDClientManager;
import datadog.communication.monitor.Monitoring;
import datadog.communication.monitor.Recording;
import datadog.trace.api.BaseHash;
import datadog.trace.api.telemetry.LogCollector;
import datadog.trace.util.Strings;
import java.nio.ByteBuffer;
Expand Down Expand Up @@ -228,7 +229,16 @@ private String probeTracesEndpoint(String[] endpoints) {
}

private void processInfoResponseHeaders(Response response) {
ContainerInfo.get().setContainerTagsHash(response.header(DATADOG_CONTAINER_TAGS_HASH));
String newContainerTagsHash = response.header(DATADOG_CONTAINER_TAGS_HASH);
if (newContainerTagsHash != null) {
ContainerInfo containerInfo = ContainerInfo.get();
synchronized (containerInfo) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that the info endpoint cannot be called concurrently so perhaps this might be avoided

if (!newContainerTagsHash.equals(containerInfo.getContainerTagsHash())) {
containerInfo.setContainerTagsHash(newContainerTagsHash);
BaseHash.recalcBaseHash(newContainerTagsHash);
}
}
}
}

@SuppressWarnings("unchecked")
Expand Down
5 changes: 0 additions & 5 deletions dd-java-agent/instrumentation/jdbc/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,3 @@ tasks.named("latestDepJava11Test").configure {
tasks.withType(Test).configureEach {
usesService(testcontainersLimit)
}

jmh {
jmhVersion = libs.versions.jmh.get()
duplicateClassesStrategy = DuplicatesStrategy.EXCLUDE
}
41 changes: 0 additions & 41 deletions ...mentation/jdbc/src/jmh/java/datadog/trace/instrumentation/jdbc/SQLCommenterBenchmark.java
View file
Open in desktop

This file was deleted.

14 changes: 3 additions & 11 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 @@ -116,7 +116,6 @@ public static String onEnter(
if (callDepth > 0) {
return null;
}
final String inputSql = sql;
final DBInfo dbInfo =
JDBCDecorator.parseDBInfo(
connection, InstrumentationContext.get(Connection.class, DBInfo.class));
Expand All @@ -125,16 +124,9 @@ public static String onEnter(
dbService =
traceConfig(activeSpan()).getServiceMapping().getOrDefault(dbService, dbService);
}
if (dbInfo.getType().equals("sqlserver")) {
sql =
SQLCommenter.append(
sql, dbService, dbInfo.getType(), dbInfo.getHost(), dbInfo.getDb());
} else {
sql =
SQLCommenter.prepend(
sql, dbService, dbInfo.getType(), dbInfo.getHost(), dbInfo.getDb());
}
return inputSql;
boolean append = "sqlserver".equals(dbInfo.getType());
return SQLCommenter.inject(
sql, dbService, dbInfo.getType(), dbInfo.getHost(), dbInfo.getDb(), null, append);
}
return sql;
}
Expand Down
8 changes: 4 additions & 4 deletions .../instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/JDBCDecorator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,14 @@ public class JDBCDecorator extends DatabaseClientDecorator<DBInfo> {

public static final String DD_INSTRUMENTATION_PREFIX = "_DD_";

public static final String DBM_PROPAGATION_MODE = Config.get().getDBMPropagationMode();
public static final String DBM_PROPAGATION_MODE = Config.get().getDbmPropagationMode();
public static final boolean INJECT_COMMENT =
DBM_PROPAGATION_MODE.equals(DBM_PROPAGATION_MODE_FULL)
|| DBM_PROPAGATION_MODE.equals(DBM_PROPAGATION_MODE_STATIC);
private static final boolean INJECT_TRACE_CONTEXT =
DBM_PROPAGATION_MODE.equals(DBM_PROPAGATION_MODE_FULL);
public static final boolean DBM_TRACE_PREPARED_STATEMENTS =
Config.get().isDBMTracePreparedStatements();
Config.get().isDbmTracePreparedStatements();

private volatile boolean warnedAboutDBMPropagationMode = false; // to log a warning only once

Expand Down Expand Up @@ -420,7 +420,7 @@ public boolean shouldInjectTraceContext(DBInfo dbInfo) {
}

public boolean shouldInjectSQLComment() {
return Config.get().getDBMPropagationMode().equals(DBM_PROPAGATION_MODE_FULL)
|| Config.get().getDBMPropagationMode().equals(DBM_PROPAGATION_MODE_STATIC);
return Config.get().getDbmPropagationMode().equals(DBM_PROPAGATION_MODE_FULL)
|| Config.get().getDbmPropagationMode().equals(DBM_PROPAGATION_MODE_STATIC);
}
}
Loading
Loading