normalize key

amarziali · amarziali · commit 5136c2e8e234 · 2026-04-29T16:28:49.000+02:00
diff --git a/internal-api/src/main/java/datadog/trace/api/ProcessTags.java b/internal-api/src/main/java/datadog/trace/api/ProcessTags.java
@@ -96,7 +96,7 @@ private static void parseMappingEntry(
             "No value for key '{}' from source '{}' in process.tags.mapping", configKey, source);
         return;
       }
-      tags.put(processTagKey, value);
+      tags.put(TraceUtils.normalizeTagValue(processTagKey), value);
     }
 
     private static void fillJeeTags(SortedMap<String, String> tags) {
diff --git a/internal-api/src/test/groovy/datadog/trace/api/ProcessTagsForkedTest.groovy b/internal-api/src/test/groovy/datadog/trace/api/ProcessTagsForkedTest.groovy
@@ -249,6 +249,22 @@ class ProcessTagsForkedTest extends DDSpecification {
     System.clearProperty("prop.b")
   }
 
+  def 'should normalize mapped process tag key'() {
+    setup:
+    System.setProperty("my.prop", "some_value")
+    injectSysConfig("process.tags.mapping", "{prop}my.prop:1Tenant")
+    ProcessTags.reset()
+    when:
+    def tags = ProcessTags.getTagsAsStringList()
+    then:
+    // key '1Tenant' is valid (leading digit is allowed) but the colon in raw keys would be invalid;
+    // normalizeTagValue strips leading non-alphanumeric chars and replaces colons — verify the key is stored normalized
+    tags.any { it.startsWith("1tenant:") }
+    !tags.any { it.startsWith("1Tenant:") }
+    cleanup:
+    System.clearProperty("my.prop")
+  }
+
   def 'process tag value normalization'() {
     setup:
     ProcessTags.addTag("test", testValue)

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ private static void parseMappingEntry(`
`96`	`96`	`"No value for key '{}' from source '{}' in process.tags.mapping", configKey, source);`
`97`	`97`	`return;`
`98`	`98`	`}`
`99`		`- tags.put(processTagKey, value);`
	`99`	`+ tags.put(TraceUtils.normalizeTagValue(processTagKey), value);`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`private static void fillJeeTags(SortedMap<String, String> tags) {`