updating DD_TAGS to belong under breaking change flag

mhlidd · mhlidd · commit 04f1bfd9eb3d · 2025-03-12T12:57:18.000-04:00
diff --git a/internal-api/src/main/java/datadog/trace/api/Config.java b/internal-api/src/main/java/datadog/trace/api/Config.java
@@ -775,7 +775,11 @@ private Config(final ConfigProvider configProvider, final InstrumenterConfig ins
 
     {
       final Map<String, String> tags = new HashMap<>(configProvider.getMergedMap(GLOBAL_TAGS));
-      tags.putAll(configProvider.getMergedTagsMap(TRACE_TAGS, TAGS));
+      if (experimentalFeaturesEnabled.contains("DD_TAGS")) {
+        tags.putAll(configProvider.getMergedTagsMap(TRACE_TAGS, TAGS));
+      } else {
+        tags.putAll(configProvider.getMergedMap(TRACE_TAGS, TAGS));
+      }
       if (serviceNameSetByUser) { // prioritize service name set by DD_SERVICE over DD_TAGS config
         tags.remove("service");
       }
diff --git a/internal-api/src/test/groovy/datadog/trace/api/ConfigTest.groovy b/internal-api/src/test/groovy/datadog/trace/api/ConfigTest.groovy
@@ -1889,6 +1889,35 @@ class ConfigTest extends DDSpecification {
     [serviceProperty, serviceName] << [[SERVICE, SERVICE_NAME], [DEFAULT_SERVICE_NAME, "my-service"]].combinations()
   }
 
+  def "verify behavior of features under DD_TRACE_EXPERIMENTAL_FEATURES_ENABLED"() {
+    setup:
+    environmentVariables.set("DD_TRACE_EXPERIMENTAL_FEATURES_ENABLED", "DD_TAGS")
+    environmentVariables.set("DD_TAGS", "env:test,aKey:aVal bKey:bVal cKey:")
+
+    when:
+    def config = new Config()
+
+    then:
+    config.experimentalFeaturesEnabled == ["DD_TAGS"].toSet()
+
+    //verify expected behavior enabled under feature flag
+    config.globalTags == [env: "test", aKey: "aVal bKey:bVal cKey:"]
+  }
+
+  def "verify behavior of 'breaking change' configs when not under DD_TRACE_EXPERIMENTAL_FEATURES_ENABLED"() {
+    setup:
+    environmentVariables.set("DD_TAGS", "env:test,aKey:aVal bKey:bVal cKey:")
+
+    when:
+    def config = new Config()
+
+    then:
+    config.experimentalFeaturesEnabled == [].toSet()
+
+    //verify expected behavior when not enabled under feature flag
+    config.globalTags == [env:"test", aKey:"aVal", bKey:"bVal"]
+  }
+
   def "detect if agent is configured using default values"() {
     setup:
     if (host != null) {

Original file line number	Diff line number	Diff line change
`@@ -775,7 +775,11 @@ private Config(final ConfigProvider configProvider, final InstrumenterConfig ins`
`775`	`775`
`776`	`776`	`{`
`777`	`777`	`final Map<String, String> tags = new HashMap<>(configProvider.getMergedMap(GLOBAL_TAGS));`
`778`		`- tags.putAll(configProvider.getMergedTagsMap(TRACE_TAGS, TAGS));`
	`778`	`+ if (experimentalFeaturesEnabled.contains("DD_TAGS")) {`
	`779`	`+ tags.putAll(configProvider.getMergedTagsMap(TRACE_TAGS, TAGS));`
	`780`	`+ } else {`
	`781`	`+ tags.putAll(configProvider.getMergedMap(TRACE_TAGS, TAGS));`
	`782`	`+ }`
`779`	`783`	`if (serviceNameSetByUser) { // prioritize service name set by DD_SERVICE over DD_TAGS config`
`780`	`784`	`tags.remove("service");`
`781`	`785`	`}`