Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Match Hands Off Config selectors on process_arguments value #9201

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 17 commits into from
Jul 22, 2025
Merged

Match Hands Off Config selectors on process_arguments value #9201

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
2df85ac
feat: match stable config java properties on other operator than 'con…
paullegranddc Jul 18, 2025
314525a
fix: lowercase match value
paullegranddc Jul 18, 2025
b051555
fix: extra parameter
paullegranddc Jul 18, 2025
c094176
fix: remove duplicate values
paullegranddc Jul 18, 2025
a58bd09
fix: lint
paullegranddc Jul 18, 2025
db6e5c7
fi: wrong variable
paullegranddc Jul 18, 2025
5865dc8
fix lint
paullegranddc Jul 18, 2025
2f93fad
fix: tests
paullegranddc Jul 18, 2025
ebf333b
fix: null matches with exist should work
paullegranddc Jul 18, 2025
75f6dae
feat: add tests for equal operator on arguments
paullegranddc Jul 18, 2025
cfb37db
fix: use equal method instead of operator
paullegranddc Jul 20, 2025
a8ff152
Update internal-api/src/main/java/datadog/trace/bootstrap/config/prov…
mtoffl01 Jul 21, 2025
6f1ea89
apply PR suggestions
mtoffl01 Jul 21, 2025
db73932
fix typo
mtoffl01 Jul 21, 2025
12c673d
Add missing locale
mtoffl01 Jul 21, 2025
4f4c5bc
add matches == null check back in to avoid NPE
mtoffl01 Jul 22, 2025
2cf1092
Merge branch 'master' into paullgdc/stable_config/match_equal_args
mtoffl01 Jul 22, 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
Prev Previous commit
Next Next commit
feat: add tests for equal operator on arguments
  • Loading branch information
@paullegranddc
paullegranddc committed Jul 18, 2025
commit 75f6daeaab4acdc731e18c25fb03cf7cdca990d3
8 changes: 4 additions & 4 deletions 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 @@ -104,7 +104,7 @@ private static boolean doesRuleMatch(Rule rule) {
}

private static boolean matchOperator(String value, String operator, List<String> matches) {
// not sure if these are nullable, but the semantics make sense
// not sure if these are nullable, but the semantics makes sense
// and that will save us from a NPE
if (value == null || operator == null) {
return false;
Expand Down Expand Up @@ -140,6 +140,9 @@ private static boolean matchOperator(String value, String operator, List<String>
// We do all of the case insensitivity modifications in this function, because each selector will
// be viewed just once
static boolean selectorMatch(String origin, List<String> matches, String operator, String key) {
if (operator == null) {
return false;
}
operator = operator.toLowerCase();
switch (origin.toLowerCase()) {
case "language":
Expand All @@ -152,9 +155,6 @@ static boolean selectorMatch(String origin, List<String> matches, String operato
return false;
}
String envValue = System.getenv(key.toUpperCase());
if (envValue == null) {
return false;
}
return matchOperator(envValue, operator, matches);
case "process_arguments":
if (key == null) {
Expand Down
10 changes: 10 additions & 0 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 @@ -68,6 +68,8 @@ apm_configuration_rules:
injectEnvConfig("DD_PROFILING_ENABLED", "true")
injectEnvConfig("DD_SERVICE", "mysvc")
injectEnvConfig("DD_TAGS", "team:apm,component:web")
System.setProperty("arg1", "value1")

def match = StableConfigParser.selectorMatch(origin, matches, operator, key)

then:
Expand All @@ -83,6 +85,7 @@ apm_configuration_rules:
"language" | ["java"] | "exists" | "" | false
"language" | ["java"] | "something unexpected" | "" | false
"environment_variables" | [] | "exists" | "DD_TAGS" | true
"environment_variables" | null | "exists" | "DD_TAGS" | true
"environment_variables" | ["team:apm"] | "contains" | "DD_TAGS" | true
"ENVIRONMENT_VARIABLES" | ["TeAm:ApM"] | "CoNtAiNs" | "Dd_TaGs" | true // check case insensitivity
"environment_variables" | ["team:apm"] | "equals" | "DD_TAGS" | false
Expand All @@ -96,6 +99,13 @@ apm_configuration_rules:
"environment_variables" | ["svc"] | "contains" | "DD_SERVICE" | true
"environment_variables" | ["other"] | "contains" | "DD_SERVICE" | false
"environment_variables" | [null] | "contains" | "DD_SERVICE" | false
"environment_variables" | [] | "equals" | null | false
"environment_variables" | null | "equals" | "DD_SERVICE" | false
"language" | ["java"] | null | "" | false
"process_arguments" | null | "exists" | "-Darg1" | true
"process_arguments" | null | "exists" | "-Darg2" | false
"process_arguments" | ["value1"] | "equals" | "-Darg1" | true
"process_arguments" | ["value2"] | "equals" | "-Darg1" | false
}

def "test duplicate entries not allowed"() {
Expand Down
Loading