Skip to content

Stable Config parsing: Treat empty environment variable or process argument values as empty string #8759

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
merged 24 commits into from
May 29, 2025
+5 −5
Merged

Stable Config parsing: Treat empty environment variable or process argument values as empty string #8759

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
d112dc7
migrate CLIHelper to use a Map, parse system properties in key-vals
mtoffl01 Apr 10, 2025
3ba99af
Fix processTemplateVar logic to remove superfluous ':'
mtoffl01 Apr 16, 2025
9caeb5d
nits: javadocs
mtoffl01 Apr 17, 2025
d0f194b
Move writeFileRaw helper to testutils
mtoffl01 Apr 21, 2025
457c288
Add YamlParser tests
mtoffl01 Apr 21, 2025
06ae9ac
Revert CLIHelper to use List<String>; lazily load a Map cache for que…
mtoffl01 Apr 29, 2025
06712dc
reuse logic for adding to the vm args cache
mtoffl01 Apr 29, 2025
0a1da8f
apply github suggestions
mtoffl01 May 1, 2025
e106416
Move processTemplate yaml helper fns into StableConfigParser, along w…
mtoffl01 May 1, 2025
48adeaa
Remove changes to CLIHelper; rely on System.getProperty instead
mtoffl01 May 1, 2025
24b8615
optimize: return from processTemplate early if no {{ found
mtoffl01 May 1, 2025
cc76954
Add more test coverage to StableConfigParserTest
mtoffl01 May 1, 2025
afddf95
Merge branch 'master' into mtoff/scfg_fix
mtoffl01 May 1, 2025
fc4652c
Optimize template processing to reduce use of substrings
mcculls May 2, 2025
e633f26
Introduce constants for repeated strings
mcculls May 2, 2025
b5deffd
Change UNDEFINED_VALUE to empty string
mtoffl01 May 2, 2025
9104f0d
Add log messages for empty environment_variable and process_argument …
mtoffl01 May 2, 2025
ecb5a15
Remove FileUtils and all its references
mtoffl01 May 5, 2025
5b46087
resolve merge conflicts w. master
mtoffl01 May 6, 2025
fbf809a
Merge branch 'master' into mtoff/scfg_fix_2
mtoffl01 May 8, 2025
a1bba89
Remove noisy debug logs on UNDEFINED case
mtoffl01 May 27, 2025
6dacba4
Merge branch 'mtoff/scfg_fix_2' of github.com:DataDog/dd-trace-java i…
mtoffl01 May 27, 2025
eb5e375
merge with master
mtoffl01 May 27, 2025
4213b94
Merge branch 'master' into mtoff/scfg_fix_2
mcculls May 29, 2025
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
2 changes: 1 addition & 1 deletion internal-api/src/main/java/datadog/trace/bootstrap/config/provider/StableConfigParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public class StableConfigParser {

private static final String ENVIRONMENT_VARIABLES_PREFIX = "environment_variables['";
private static final String PROCESS_ARGUMENTS_PREFIX = "process_arguments['";
private static final String UNDEFINED_VALUE = "UNDEFINED";
private static final String UNDEFINED_VALUE = "";

/**
* Parses a configuration file and returns a stable configuration object.
Expand Down
8 changes: 4 additions & 4 deletions ...api/src/test/groovy/datadog/trace/bootstrap/config/provider/StableConfigParserTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,13 +190,13 @@ apm_configuration_rules:
where:
templateVar | envKey | envVal | expect
"{{environment_variables['DD_KEY']}}" | "DD_KEY" | "value" | "value"
"{{environment_variables['DD_KEY']}}" | null | null | "UNDEFINED"
"{{}}" | null | null | "UNDEFINED"
"{{environment_variables['DD_KEY']}}" | null | null | ""
"{{}}" | null | null | ""
"{}" | null | null | "{}"
"{{environment_variables['dd_key']}}" | "DD_KEY" | "value" | "value"
"{{environment_variables['DD_KEY}}" | "DD_KEY" | "value" | "UNDEFINED"
"{{environment_variables['DD_KEY}}" | "DD_KEY" | "value" | ""
"header-{{environment_variables['DD_KEY']}}-footer" | "DD_KEY" | "value" | "header-value-footer"
"{{environment_variables['HEADER']}}{{environment_variables['DD_KEY']}}{{environment_variables['FOOTER']}}" | "DD_KEY" | "value" | "UNDEFINEDvalueUNDEFINED"
"{{environment_variables['HEADER']}}{{environment_variables['DD_KEY']}}{{environment_variables['FOOTER']}}" | "DD_KEY" | "value" | "value"
}

def "test processTemplate error cases"() {
Expand Down
Loading