Add a new dynamic_service DBM propagation mode (#11432)

Add a new dynamic_service DBM propagation mode

Merge branch 'master' into andrea.marziali/dbm-dynamic-service

Co-authored-by: andrea.marziali <andrea.marziali@datadoghq.com>

Author: amarziali

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

@@ -1,5 +1,6 @@
 package datadog.trace.instrumentation.jdbc;
 
+import static datadog.trace.api.Config.DBM_PROPAGATION_MODE_DYNAMIC_SERVICE;
 import static datadog.trace.api.Config.DBM_PROPAGATION_MODE_FULL;
 import static datadog.trace.api.Config.DBM_PROPAGATION_MODE_STATIC;
 import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan;
@@ -60,7 +61,8 @@ public class JDBCDecorator extends DatabaseClientDecorator<DBInfo> {
       Config.get().isExperimentalPropagateProcessTagsEnabled();
   public static final boolean INJECT_COMMENT =
       DBM_PROPAGATION_MODE.equals(DBM_PROPAGATION_MODE_FULL)
-          || DBM_PROPAGATION_MODE.equals(DBM_PROPAGATION_MODE_STATIC);
+          || DBM_PROPAGATION_MODE.equals(DBM_PROPAGATION_MODE_STATIC)
+          || DBM_PROPAGATION_MODE.equals(DBM_PROPAGATION_MODE_DYNAMIC_SERVICE);
   private static final boolean INJECT_TRACE_CONTEXT =
       DBM_PROPAGATION_MODE.equals(DBM_PROPAGATION_MODE_FULL);
   public static final boolean DBM_TRACE_PREPARED_STATEMENTS =

dd-java-agent/instrumentation/jdbc/src/test/groovy/DBMInjectionForkedTest.groovy

@@ -2,7 +2,6 @@ import datadog.trace.agent.test.InstrumentationSpecification
 import datadog.trace.api.BaseHash
 import datadog.trace.api.DDSpanTypes
 import datadog.trace.api.ProcessTags
-import datadog.trace.api.config.GeneralConfig
 import datadog.trace.api.config.TraceInstrumentationConfig
 import datadog.trace.api.config.TracerConfig
 import datadog.trace.bootstrap.instrumentation.api.Tags
@@ -83,13 +82,49 @@ class DBMAppendInjectionForkedTest extends InjectionTest {
   }
 }
 
+class DBMDynamicServiceInjectionForkedTest extends InjectionTest {
+
+  @Override
+  void configurePreAgent() {
+    super.configurePreAgent()
+    // override to dynamic_service (InjectionTest sets full)
+    injectSysConfig(TraceInstrumentationConfig.DB_DBM_PROPAGATION_MODE_MODE, "dynamic_service")
+  }
+
+  def "dynamic_service injects comment with base hash but no traceparent"() {
+    setup:
+    ProcessTags.reset()
+    BaseHash.updateBaseHash(123456789L)
+    def connection = new TestConnection(false)
+
+    when:
+    def statement = connection.createStatement() as TestStatement
+    statement.executeQuery(query)
+
+    then:
+    assert statement.sql.contains("ddps='my_service_name'")
+    assert statement.sql.contains("dddbs='remapped_testdb'")
+    assert statement.sql.contains("ddsh='123456789'")
+    assert !statement.sql.contains("traceparent=")
+    assertTraces(1) {
+      trace(1) {
+        span {
+          spanType DDSpanTypes.SQL
+          tags(false) {
+            "$Tags.BASE_HASH" "123456789"
+          }
+        }
+      }
+    }
+  }
+}
+
 class DBMBaseHashInjectionForkedTest extends InjectionTest {
 
   @Override
   void configurePreAgent() {
     super.configurePreAgent()
     injectSysConfig(TraceInstrumentationConfig.DB_DBM_INJECT_SQL_BASEHASH, "true")
-    injectSysConfig(GeneralConfig.EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED, "true")
   }
 
   def "base hash tag is set on span and matches the one in the SQL comment"() {

dd-java-agent/instrumentation/jdbc/src/test/groovy/JDBCDecoratorTest.groovy

@@ -68,3 +68,16 @@ class JDBCDecoratorNoPropagationForkedTest extends JDBCDecoratorTest {
     return false
   }
 }
+
+class JDBCDecoratorDynamicServicePropagationForkedTest extends JDBCDecoratorTest {
+  @Override
+  protected void setupPropagationMode() {
+    injectSysConfig(DB_DBM_PROPAGATION_MODE_MODE, "dynamic_service")
+  }
+
+  @Override
+  protected boolean expectedFromConfig() {
+    // dynamic_service behaves like service mode: no trace context injection
+    return false
+  }
+}

internal-api/src/main/java/datadog/trace/api/Config.java

@@ -5638,7 +5638,7 @@ public long getDependecyResolutionPeriodMillis() {
   }
 
   public boolean isDbmInjectSqlBaseHash() {
-    return dbmInjectSqlBaseHash;
+    return dbmInjectSqlBaseHash || DBM_PROPAGATION_MODE_DYNAMIC_SERVICE.equals(dbmPropagationMode);
   }
 
   public boolean isDbmTracePreparedStatements() {
@@ -5656,14 +5656,16 @@ public String getDbmPropagationMode() {
   // Database monitoring propagation mode constants
   public static final String DBM_PROPAGATION_MODE_STATIC = "service";
   public static final String DBM_PROPAGATION_MODE_FULL = "full";
+  public static final String DBM_PROPAGATION_MODE_DYNAMIC_SERVICE = "dynamic_service";
 
   // Helper method to check if comment injection is enabled
   public boolean isDbmCommentInjectionEnabled() {
     if (dbmPropagationMode == null) {
       return false;
     }
     return dbmPropagationMode.equals(DBM_PROPAGATION_MODE_FULL)
-        || dbmPropagationMode.equals(DBM_PROPAGATION_MODE_STATIC);
+        || dbmPropagationMode.equals(DBM_PROPAGATION_MODE_STATIC)
+        || dbmPropagationMode.equals(DBM_PROPAGATION_MODE_DYNAMIC_SERVICE);
   }
 
   private void logIgnoredSettingWarning(