chore(crashtracking): Collapse adjacent redacted path or package segments

Author: bric3

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

@@ -12,6 +12,7 @@
 public final class RedactUtils {
 
   static final String REDACTED = "redacted";
+  static final String REDACTED_CLASS = "Redacted";
   private static final String REDACTED_STRING = "REDACTED";
 
   private static final String[] KNOWN_PACKAGES_PREFIXES = {
@@ -25,6 +26,9 @@ public final class RedactUtils {
     // Oracle/Sun vendor packages
     "com/sun/",
     "com/oracle/",
+    // Datadog top-level and internal shorthand
+    "datadog/",
+    "com/dd/",
   };
 
   // " - string: "value"" in String oop dumps
@@ -112,8 +116,9 @@ private static String redactLine(String line, boolean isClassOop) {
   /**
    * Redacts {@code "value"\{0x...\}} OOP references in oop dump field lines. When {@code
    * isClassOop} is true (inside a {@code java.lang.Class} oop dump) the value is treated as a class
-   * name and its package is redacted. Otherwise — any other oop type — the value is always fully
-   * redacted to {@code "REDACTED"} since it may be arbitrary application data.
+   * name and redacted to {@code "redacted.Redacted"} unless it belongs to a known package.
+   * Otherwise — any other oop type — the value is always fully redacted to {@code "REDACTED"} since
+   * it may be arbitrary application data.
    */
   private static String redactStringOopRef(String line, boolean isClassOop) {
     return replaceAll(
@@ -202,8 +207,8 @@ static String redactReadableMemoryHexDump(String line) {
   }
 
   /**
-   * Redacts the package of a slash-separated JVM class name, unless it belongs to a known package.
-   * <code>com/company/SomeType</code> to <code>redacted/redacted/SomeType</code>; <code>
+   * Redacts a slash-separated JVM class name, unless it belongs to a known package. Unknown classes
+   * are fully redacted: <code>com/company/SomeType</code> to <code>redacted/Redacted</code>; <code>
    * java/lang/String</code> unchanged.
    */
   static String redactJvmClassName(String className) {
@@ -214,9 +219,9 @@ static String redactJvmClassName(String className) {
   }
 
   /**
-   * Redacts the package of a dot-separated class name, unless it belongs to a known package. <code>
-   * com.company.SomeType</code> to <code>redacted.redacted.SomeType</code>; <code>java.lang.String
-   * </code> unchanged.
+   * Redacts a dot-separated class name, unless it belongs to a known package. Unknown classes are
+   * fully redacted: <code>com.company.SomeType</code> to <code>redacted.Redacted</code>; <code>
+   * java.lang.String</code> unchanged.
    */
   static String redactDottedClassName(String className) {
     if (isKnownJvmPackage(className.replace('.', '/'))) {
@@ -227,38 +232,22 @@ static String redactDottedClassName(String className) {
 
   private static String redactClassName(char sep, String className) {
     int lastSep = className.lastIndexOf(sep);
-    if (lastSep < 0) return className;
-    StringBuilder sb = new StringBuilder();
-    int pos = 0;
-    while (pos <= lastSep) {
-      int next = className.indexOf(sep, pos);
-      if (sb.length() > 0) sb.append(sep);
-      sb.append(REDACTED);
-      pos = next + 1;
-    }
-    return sb.append(sep).append(className, lastSep + 1, className.length()).toString();
+    if (lastSep < 0) return className; // no package — nothing to redact
+    return REDACTED + sep + REDACTED_CLASS;
   }
 
   /**
-   * Redacts all path segments except the parent directory and filename. <code>/path/to/dir/lib.so
-   * </code> to <code>/redacted/redacted/dir/lib.so</code>
+   * Redacts all but the parent directory and filename from a library path, collapsing all
+   * intermediate segments to a single {@code redacted}. <code>/path/to/dir/lib.so</code> to <code>
+   * /redacted/dir/lib.so</code>
    */
-  @SuppressForbidden // split on single-character uses a fast path without regex
   static String redactPath(String path) {
-    String[] parts = path.split("/", -1);
-    // parts[0] is always "" (before the leading slash)
-    if (parts.length <= 3) {
-      return path; // /dir/file or shorter: nothing to redact
-    }
-    StringBuilder sb = new StringBuilder();
-    for (int i = 1; i < parts.length - 2; i++) {
-      sb.append('/').append(REDACTED);
-    }
-    return sb.append('/')
-        .append(parts[parts.length - 2])
-        .append('/')
-        .append(parts[parts.length - 1])
-        .toString();
+    int last = path.lastIndexOf('/');
+    if (last <= 0) return path; // /file or empty — nothing to redact
+    int secondLast = path.lastIndexOf('/', last - 1);
+    if (secondLast <= 0) return path; // /dir/file — nothing to redact
+    // Collapse everything before the second-last slash to a single /redacted
+    return "/" + REDACTED + path.substring(secondLast);
   }
 
   private static boolean isKnownJvmPackage(String slashClassName) {
@@ -267,7 +256,10 @@ private static boolean isKnownJvmPackage(String slashClassName) {
         return true;
       }
     }
-    return slashClassName.contains("datadog") || slashClassName.startsWith("com/dd/");
+    // Match *.datadog* — packages whose second segment starts with "datadog"
+    // e.g. com/datadog/..., org/datadog/..., com/datadoghq/...
+    int slash = slashClassName.indexOf('/');
+    return slash > 0 && slashClassName.startsWith("datadog", slash + 1);
   }
 
   private static String replaceAll(

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

@@ -103,18 +103,15 @@ public void testRegisterToMemoryMappingMacosAarch64() throws Exception {
         .containsEntry("x2", "0x0 is null")
         .containsEntry("x28", "0x0000000100a153f0 is a thread");
 
-    // Library path (symbol+offset format) — path must be redacted, keeping only last 2 segments
-    // /usr/lib/system/libsystem_pthread.dylib → 2 redacted ("usr","lib") + "system/lib..."
+    // Library path (symbol+offset format) — intermediate segments collapsed to a single /redacted
     assertThat(mapping)
         .extractingByKey("x16", STRING)
         .isEqualTo(
-            "0x0000000182d709d0: pthread_jit_write_protect_np+0 in /redacted/redacted/system/libsystem_pthread.dylib at 0x0000000182d69000");
-    // /Users/USER/.local/share/mise/installs/java/25.0.2/lib/server/libjvm.dylib → 9 redacted +
-    // "server/libjvm.dylib"
+            "0x0000000182d709d0: pthread_jit_write_protect_np+0 in /redacted/system/libsystem_pthread.dylib at 0x0000000182d69000");
     assertThat(mapping)
         .extractingByKey("x21", STRING)
         .isEqualTo(
-            "0x0000000106c1ccc0: _ZN19TemplateInterpreter13_active_tableE+0 in /redacted/redacted/redacted/redacted/redacted/redacted/redacted/redacted/redacted/server/libjvm.dylib at 0x0000000105efc000");
+            "0x0000000106c1ccc0: _ZN19TemplateInterpreter13_active_tableE+0 in /redacted/server/libjvm.dylib at 0x0000000105efc000");
 
     // macOS aarch64 uses address+pipe format — address kept, bytes redacted
     assertThat(mapping)
@@ -167,10 +164,10 @@ public void testRegisterToMemoryMapping() throws Exception {
         .containsEntry(
             "R11",
             "{method} {0x00007f3744198b70} 'resize' '()[Ljava/util/HashMap$Node;' in 'java/util/HashMap'")
-        // unknown packages are redacted; known class names (last segment) are preserved
+        // unknown packages are fully redacted to redacted/Redacted
         .containsEntry(
             "RSI",
-            "{method} {0x00007f3639c2ff00} 'saveJob' '(Lredacted/redacted/redacted/redacted/REDACT_THIS;ILjava/lang/String;)V' in 'redacted/redacted/redacted/redacted/REDACT_THIS'");
+            "{method} {0x00007f3639c2ff00} 'saveJob' '(Lredacted/Redacted;ILjava/lang/String;)V' in 'redacted/Redacted'");
   }
 
   @Test