Replace local JfrScrubber with jafar-tools 0.13.0

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: jbachorik

NATIVE_IMAGE_FIX_STATUS.md

@@ -274,8 +274,7 @@ && isEventEnabled(recordingSettings, "jdk.NativeMethodSample")) {
   private static String getJfrRepositoryBase(ConfigProvider configProvider) {
     String jfrRepoDefault = System.getProperty("java.io.tmpdir") + "/dd/jfr";
     String legacy =
-        configProvider.getString(
-            ProfilingConfig.PROFILING_JFR_REPOSITORY_BASE, jfrRepoDefault);
+        configProvider.getString(ProfilingConfig.PROFILING_JFR_REPOSITORY_BASE, jfrRepoDefault);
     if (!legacy.equals(jfrRepoDefault)) {
       log.warn(
           "The configuration key {} is deprecated. Please use {} instead.",

dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/OpenJdkController.java

@@ -6,7 +6,12 @@ minimumBranchCoverage = 0.0
 dependencies {
   api libs.slf4j
 
-  implementation libs.jafar.parser
+  implementation(libs.jafar.tools) {
+    // ASM is only used by jafar's CodeGenerator/Deserializer path which the scrubber does not use
+    exclude group: 'org.ow2.asm', module: 'asm'
+    // Agent has its own slf4j binding
+    exclude group: 'org.slf4j', module: 'slf4j-simple'
+  }
 
   testImplementation libs.bundles.junit5
   testImplementation libs.bundles.mockito

dd-java-agent/agent-profiling/profiling-scrubber/build.gradle

@@ -1,53 +1,51 @@
 package com.datadog.profiling.scrubber;
 
+import io.jafar.tools.Scrubber;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.function.Function;
 
 /** Provides the default scrub definition targeting sensitive JFR event fields. */
 public final class DefaultScrubDefinition {
 
-  private static final Map<String, JfrScrubber.ScrubField> DEFAULT_SCRUB_FIELDS;
+  private static final Map<String, Scrubber.ScrubField> DEFAULT_SCRUB_FIELDS;
 
   static {
-    Map<String, JfrScrubber.ScrubField> fields = new HashMap<>();
+    Map<String, Scrubber.ScrubField> fields = new HashMap<>();
     // System properties may contain API keys, passwords
-    fields.put(
-        "jdk.InitialSystemProperty", new JfrScrubber.ScrubField(null, "value", (k, v) -> true));
+    fields.put("jdk.InitialSystemProperty", new Scrubber.ScrubField(null, "value", (k, v) -> true));
     // JVM args may contain credentials in -D flags
-    fields.put(
-        "jdk.JVMInformation", new JfrScrubber.ScrubField(null, "jvmArguments", (k, v) -> true));
+    fields.put("jdk.JVMInformation", new Scrubber.ScrubField(null, "jvmArguments", (k, v) -> true));
     // Env vars may contain secrets
     fields.put(
-        "jdk.InitialEnvironmentVariable",
-        new JfrScrubber.ScrubField(null, "value", (k, v) -> true));
+        "jdk.InitialEnvironmentVariable", new Scrubber.ScrubField(null, "value", (k, v) -> true));
     // Process command lines may reveal infrastructure
-    fields.put(
-        "jdk.SystemProcess", new JfrScrubber.ScrubField(null, "commandLine", (k, v) -> true));
+    fields.put("jdk.SystemProcess", new Scrubber.ScrubField(null, "commandLine", (k, v) -> true));
     DEFAULT_SCRUB_FIELDS = Collections.unmodifiableMap(fields);
   }
 
   /**
-   * Creates a scrub definition function that maps event type names to their scrub field
-   * definitions.
+   * Creates a scrubber with the default scrub definition.
    *
    * @param excludeEventTypes list of event type names to exclude from scrubbing, or null for none
-   * @return a function mapping event type names to scrub field definitions
+   * @return a configured {@link JfrScrubber}
    */
-  public static Function<String, JfrScrubber.ScrubField> create(List<String> excludeEventTypes) {
+  public static JfrScrubber create(List<String> excludeEventTypes) {
     Set<String> excludeSet =
-        excludeEventTypes != null ? new HashSet<>(excludeEventTypes) : Collections.<String>emptySet();
+        excludeEventTypes != null
+            ? new HashSet<>(excludeEventTypes)
+            : Collections.<String>emptySet();
 
-    return eventTypeName -> {
-      if (excludeSet.contains(eventTypeName)) {
-        return null;
-      }
-      return DEFAULT_SCRUB_FIELDS.get(eventTypeName);
-    };
+    return new JfrScrubber(
+        eventTypeName -> {
+          if (excludeSet.contains(eventTypeName)) {
+            return null;
+          }
+          return DEFAULT_SCRUB_FIELDS.get(eventTypeName);
+        });
   }
 
   private DefaultScrubDefinition() {}