Skip to content

Commit c0f3e8a

Browse files
committed
feat(crashtracking): Don't send dd properties they should be avialable via telemetry
1 parent 614c1fe commit c0f3e8a

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/parsers/RuntimeArgs.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
* <li>pre-split J9 user arguments, such as individual {@code 2CIUSERARG} records
1515
* </ul>
1616
*
17-
* <p>Only a curated subset of arguments is retained for telemetry: {@code -Ddd.*}, {@code -Djdk.*},
18-
* {@code -Djava.*}, {@code -Dsun.*}, {@code -javaagent:}, {@code -agentlib:}, {@code -X*}, and
17+
* <p>Only a curated subset of arguments is retained for telemetry: {@code -Djdk.*}, {@code
18+
* -Djava.*}, {@code -Dsun.*}, {@code -javaagent:}, {@code -agentlib:}, {@code -X*}, and
1919
* module/native-access options.
2020
*/
2121
final class RuntimeArgs {
@@ -89,7 +89,7 @@ private static boolean isAllowedSystemProperty(String arg) {
8989
if (hasSecretLikePropertyName(arg)) {
9090
return false;
9191
}
92-
if (arg.startsWith("-Ddd.") || arg.startsWith("-Djdk.") || arg.startsWith("-Dosgi.")) {
92+
if (arg.startsWith("-Djdk.") || arg.startsWith("-Dosgi.")) {
9393
return true;
9494
}
9595
// J9 lists them as vm args.

dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/parsers/RuntimeArgsTest.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ public class RuntimeArgsTest {
1919
@TableTest({
2020
"scenario | resource | isIncluded | vmArg ",
2121
"telemetry fixture logging property | sample-crash-for-telemetry.txt | true | -Djava.util.logging.config.file=/opt/REDACT_THIS/REDACT_THIS/etc/java.util.logging.properties",
22-
"telemetry fixture dd property | sample-crash-for-telemetry.txt | true | -Ddd.profiling.enabled=true ",
22+
"telemetry fixture dd property | sample-crash-for-telemetry.txt | false | -Ddd.profiling.enabled=true ",
2323
"telemetry fixture excluded property | sample-crash-for-telemetry.txt | false | -Dkaraf.startRemoteShell=REDACT_THIS ",
2424
"telemetry fixture ws provider | sample-crash-for-telemetry.txt | false | -Djavax.xml.ws.spi.Provider=com.sun.xml.ws.spi.ProviderImpl ",
2525
"telemetry with OnError | sample-crash-for-telemetry-2.txt | true | -XX:OnError=/tmp/dd_crash_uploader.sh %p ",
26-
"telemetry jdk8 | sample-crash-for-telemetry-3.txt | true | -Ddd.trace.enabled=false ",
26+
"telemetry jdk8 | sample-crash-for-telemetry-3.txt | false | -Ddd.trace.enabled=false ",
2727
"linux aarch64 | sample-crash-linux-aarch64.txt | true | --add-modules=ALL-DEFAULT ",
2828
"macos aarch64 | sample-crash-macos-aarch64.txt | true | --enable-native-access=ALL-UNNAMED ",
2929
"jdk8 zip | sample-crash-jdk8-zip-getentry.txt | true | -Dsun.zip.disableMemoryMapping=false "
@@ -62,6 +62,8 @@ public void testParseVmArgsHandlesArgNormalization(String raw, String expectedIn
6262
"scenario | raw | isIncluded | vmArg ",
6363
"jaas login config excluded | -Djava.security.auth.login.config=/etc/jaas.conf | false | -Djava.security.auth.login.config=/etc/jaas.conf ",
6464
"java socks password excluded | -Djava.net.socks.password=hunter2 | false | -Djava.net.socks.password=hunter2 ",
65+
"dd service excluded | -Ddd.service=myapp | false | -Ddd.service=myapp ",
66+
"dd trace enabled excluded | -Ddd.trace.enabled=true | false | -Ddd.trace.enabled=true ",
6567
"dd pwd excluded | -Ddd.db.pwd=hunter2 | false | -Ddd.db.pwd=hunter2 ",
6668
"dd passphrase excluded | -Ddd.ssl.passphrase=topsecret | false | -Ddd.ssl.passphrase=topsecret ",
6769
"dd api key excluded | -Ddd.api-key=deadbeef | false | -Ddd.api-key=deadbeef ",
@@ -85,7 +87,7 @@ public void testParseVmArgsExcludesSecretLikeSystemProperties(
8587
@TableTest({
8688
"scenario | resource | isIncluded | vmArg ",
8789
"truncated ibmj9 optionsfile | redacted-truncated-ibmj9-8-javacore.txt | true | -Xoptionsfile=/opt/REDACTED/java/8.0/jre/lib/ppc64/compressedrefs/options.default ",
88-
"truncated ibmj9 dd arg | redacted-truncated-ibmj9-8-javacore.txt | true | -Ddd.service=REDACTED ",
90+
"truncated ibmj9 dd arg | redacted-truncated-ibmj9-8-javacore.txt | false | -Ddd.service=REDACTED ",
8991
"truncated ibmj9 osgi arg | redacted-truncated-ibmj9-8-javacore.txt | true | -Dosgi.install.area=/opt/REDACTED ",
9092
"truncated ibmj9 status arg | redacted-truncated-ibmj9-8-javacore.txt | false | -Dwas.status.socket=REDACTED ",
9193
"truncated ibmj9 xtq arg | redacted-truncated-ibmj9-8-javacore.txt | false | -Dcom.ibm.xtq.processor.overrideSecureProcessing=true ",

0 commit comments

Comments
 (0)