Skip to content

Fix exclude identifiers normalization #8742

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 1 commit into from
Apr 28, 2025
Merged

Fix exclude identifiers normalization #8742

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 ...ger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/util/Redaction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,10 @@ static void initKeywords() {
* based on sentry list: https://github.com/getsentry/sentry-python/blob/fefb454287b771ac31db4e30fa459d9be2f977b8/sentry_sdk/scrubber.py#L17-L58
*/
KEYWORDS.addAll(PREDEFINED_KEYWORDS);
KEYWORDS.removeAll(Config.get().getDynamicInstrumentationRedactionExcludedIdentifiers());
// Exclude user defined keywords
for (String keyword : Config.get().getDynamicInstrumentationRedactionExcludedIdentifiers()) {
KEYWORDS.remove(normalize(keyword));
}
}

public static void addUserDefinedKeywords(Config config) {
Expand Down
3 changes: 2 additions & 1 deletion ...debugger-bootstrap/src/test/java/datadog/trace/bootstrap/debugger/util/RedactionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,11 @@ public void exclusions() {
setFieldInConfig(
config,
"dynamicInstrumentationRedactionExcludedIdentifiers",
new HashSet<>(Arrays.asList("password")));
new HashSet<>(Arrays.asList("password", "_2FA")));
Redaction.initKeywords();
try {
assertFalse(Redaction.isRedactedKeyword("password"));
assertFalse(Redaction.isRedactedKeyword("_2fa"));
} finally {
setFieldInConfig(
config, "dynamicInstrumentationRedactionExcludedIdentifiers", Collections.emptySet());
Expand Down
Loading