Skip to content

remove colons from process tags values #10109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vandonr merged 1 commit into from
Dec 10, 2025
+54 −4
Merged

remove colons from process tags values #10109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion internal-api/src/main/java/datadog/trace/api/ProcessTags.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,10 @@ static void calculate() {
.map(
entry ->
UTF8BytesString.create(
entry.getKey() + ":" + TraceUtils.normalizeTagValue(entry.getValue())));
entry.getKey()
+ ":"
+ TraceUtils.normalizeTagValue(
entry.getValue().replace(':', '_'))));
Copy link
Contributor

@amarziali amarziali Dec 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ideally it can also be factorised somewhere to have it reusable but not a hard requirement.

Copy link
Contributor Author

@vandonr vandonr Dec 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah, I'm not sure it's something we're going to need somewhere else any time soon

utf8ListForm = Collections.unmodifiableList(tagStream.collect(Collectors.toList()));
stringListForm =
Collections.unmodifiableList(
Expand Down
53 changes: 50 additions & 3 deletions internal-api/src/test/groovy/datadog/trace/api/ProcessTagsForkedTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
package datadog.trace.api

import static datadog.trace.api.config.GeneralConfig.EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED

import datadog.trace.api.env.CapturedEnvironment
import datadog.trace.test.util.DDSpecification

import java.nio.file.Paths

import static datadog.trace.api.config.GeneralConfig.EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED

class ProcessTagsForkedTest extends DDSpecification {

def originalProcessInfo
Expand Down Expand Up @@ -129,4 +128,52 @@ class ProcessTagsForkedTest extends DDSpecification {
assert ProcessTags.tagsAsStringList[0] == "0test:value"
assert ProcessTags.tagsAsUTF8ByteStringList[0].toString() == "0test:value"
}

def 'process tag value normalization'() {
setup:
ProcessTags.reset()
ProcessTags.addTag("test", testValue)
expect:
assert ProcessTags.tagsAsStringList != null
assert ProcessTags.tagsAsStringList.find { it.startsWith("test:") } == "test:${expectedValue}"

where:
testValue | expectedValue
"#test_starting_hash" | "test_starting_hash"
"TestCAPSandSuch" | "testcapsandsuch"
"Test Conversion Of Weird !@#\$%^&**() Characters" | "test_conversion_of_weird_characters"
"\$#weird_starting" | "weird_starting"
"disallowed:c0l0ns" | "disallowed_c0l0ns"
"1love" | "1love"
"123456" | "123456"
"7.0" | "7.0"
"ünicöde" | "ünicöde"
"ünicöde:metäl" | "ünicöde_metäl"
"Data🐨dog🐶 繋がっ⛰てて" | "data_dog_繋がっ_てて"
" spaces " | "spaces"
" #hashtag!@#spaces #__<># " | "hashtag_spaces"
":testing" | "testing"
"_foo" | "foo"
":::test" | "test"
"contiguous_____underscores" | "contiguous_underscores"
"foo_" | "foo"
"" | ""
" " | ""
"ok" | "ok"
"AlsO:ök" | "also_ök"
":still_ok" | "still_ok"
"___trim" | "trim"
"fun:ky__tag/1" | "fun_ky_tag/1"
"fun:ky@tag/2" | "fun_ky_tag/2"
"fun:ky@@@tag/3" | "fun_ky_tag/3"
"tag:1/2.3" | "tag_1/2.3"
"---fun:k####y_ta@#g/1_@@#" | "fun_k_y_ta_g/1"
"AlsO:œ#@ö))œk" | "also_œ_ö_œk"
" regulartag " | "regulartag"
"\u017Fodd_\u017Fcase\u017F" | "\u017Fodd_\u017Fcase\u017F"
"™Ö™Ö™™Ö™" | "ö_ö_ö"
"a�" | "a"
"a��" | "a"
"a��b" | "a_b"
}
}
Loading