Avoid repeated evaluation of isDbmInjectSqlBaseHash (#11459)

amarziali · devflow.devflow-routing-intake · web-flow · commit cfb9996d5c08 · 2026-05-26T17:06:48.000Z
Avoid repeated evaluation of isDbmInjectSqlBaseHash

Co-authored-by: devflow.devflow-routing-intake &lt;devflow.devflow-routing-intake@kubernetes.us1.ddbuild.io&gt;
diff --git a/internal-api/src/main/java/datadog/trace/api/Config.java b/internal-api/src/main/java/datadog/trace/api/Config.java
@@ -1790,7 +1790,9 @@ private Config(final ConfigProvider configProvider, final InstrumenterConfig ins
         configProvider.getBoolean(
             DB_DBM_ALWAYS_APPEND_SQL_COMMENT, DEFAULT_DB_DBM_ALWAYS_APPEND_SQL_COMMENT);
 
-    dbmInjectSqlBaseHash = configProvider.getBoolean(DB_DBM_INJECT_SQL_BASEHASH, false);
+    dbmInjectSqlBaseHash =
+        configProvider.getBoolean(DB_DBM_INJECT_SQL_BASEHASH, false)
+            || DBM_PROPAGATION_MODE_DYNAMIC_SERVICE.equals(dbmPropagationMode);
 
     splitByTags = tryMakeImmutableSet(configProvider.getList(SPLIT_BY_TAGS));
 
@@ -5663,7 +5665,7 @@ public long getDependecyResolutionPeriodMillis() {
   }
 
   public boolean isDbmInjectSqlBaseHash() {
-    return dbmInjectSqlBaseHash || DBM_PROPAGATION_MODE_DYNAMIC_SERVICE.equals(dbmPropagationMode);
+    return dbmInjectSqlBaseHash;
   }
 
   public boolean isDbmTracePreparedStatements() {

Original file line number	Diff line number	Diff line change
`@@ -1790,7 +1790,9 @@ private Config(final ConfigProvider configProvider, final InstrumenterConfig ins`
`1790`	`1790`	`configProvider.getBoolean(`
`1791`	`1791`	`DB_DBM_ALWAYS_APPEND_SQL_COMMENT, DEFAULT_DB_DBM_ALWAYS_APPEND_SQL_COMMENT);`
`1792`	`1792`
`1793`		`- dbmInjectSqlBaseHash = configProvider.getBoolean(DB_DBM_INJECT_SQL_BASEHASH, false);`
	`1793`	`+ dbmInjectSqlBaseHash =`
	`1794`	`+ configProvider.getBoolean(DB_DBM_INJECT_SQL_BASEHASH, false)`
	`1795`	`+ \|\| DBM_PROPAGATION_MODE_DYNAMIC_SERVICE.equals(dbmPropagationMode);`
`1794`	`1796`
`1795`	`1797`	`splitByTags = tryMakeImmutableSet(configProvider.getList(SPLIT_BY_TAGS));`
`1796`	`1798`
`@@ -5663,7 +5665,7 @@ public long getDependecyResolutionPeriodMillis() {`
`5663`	`5665`	`}`
`5664`	`5666`
`5665`	`5667`	`public boolean isDbmInjectSqlBaseHash() {`
`5666`		`- return dbmInjectSqlBaseHash \|\| DBM_PROPAGATION_MODE_DYNAMIC_SERVICE.equals(dbmPropagationMode);`
	`5668`	`+ return dbmInjectSqlBaseHash;`
`5667`	`5669`	`}`
`5668`	`5670`
`5669`	`5671`	`public boolean isDbmTracePreparedStatements() {`