Container hash tags propagation (#9282)

- Incorporate containerTagsHash (received from the Agent) in baseHash calculation
- [DBM] Inject baseHash into SQL
- [DSM] Use baseHash in DataStreamsTags

Author: ygree

communication/src/main/java/datadog/communication/ddagent/DDAgentFeaturesDiscovery.java

@@ -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;
@@ -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) {
+        if (!newContainerTagsHash.equals(containerInfo.getContainerTagsHash())) {
+          containerInfo.setContainerTagsHash(newContainerTagsHash);
+          BaseHash.recalcBaseHash(newContainerTagsHash);
+        }
+      }
+    }
   }
 
   @SuppressWarnings("unchecked")

dd-java-agent/instrumentation/jdbc/build.gradle

@@ -85,8 +85,3 @@ tasks.named("latestDepJava11Test").configure {
 tasks.withType(Test).configureEach {
   usesService(testcontainersLimit)
 }
-
-jmh {
-  jmhVersion = libs.versions.jmh.get()
-  duplicateClassesStrategy = DuplicatesStrategy.EXCLUDE
-}

dd-java-agent/instrumentation/jdbc/src/jmh/java/datadog/trace/instrumentation/jdbc/SQLCommenterBenchmark.java

@@ -111,32 +111,26 @@ public static String onEnter(
         @Advice.This Connection connection,
         @Advice.Argument(value = 0, readOnly = false) String sql) {
       //      Using INJECT_COMMENT fails to update when a test calls injectSysConfig
-      if (DECORATE.shouldInjectSQLComment()) {
-        final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(Connection.class);
-        if (callDepth > 0) {
-          return null;
-        }
-        final String inputSql = sql;
-        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);
-        }
-        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;
+      if (!DECORATE.shouldInjectSQLComment()) {
+        return sql;
       }
-      return sql;
+      if (CallDepthThreadLocalMap.incrementCallDepth(Connection.class) > 0) {
+        return null;
+      }
+      final String inputSql = sql;
+      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);
+      }
+      boolean append = "sqlserver".equals(dbInfo.getType());
+      sql =
+          SQLCommenter.inject(
+              sql, dbService, dbInfo.getType(), dbInfo.getHost(), dbInfo.getDb(), null, append);
+      return inputSql;
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)

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

@@ -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
 
@@ -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);
   }
 }