share common config key redaction method

Author: aboitreaud

dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/SparkConfAllowList.java

@@ -17,6 +17,12 @@
  * @see <a href="https://spark.apache.org/docs/latest/configuration.html">Spark Configuration</a>
  */
 class SparkConfAllowList {
+  // Using values from
+  // https://github.com/apache/spark/blob/v3.5.1/core/src/main/scala/org/apache/spark/internal/config/package.scala#L1150-L1158
+  static final String DEFAULT_REDACTION_REGEX = "(?i)secret|password|token|access.key|api.key";
+
+  private static final Pattern DEFAULT_REDACTION_PATTERN = Pattern.compile(DEFAULT_REDACTION_REGEX);
+
   /**
    * Job-specific parameters that can be used to control job execution or provide metadata about the
    * job being executed
@@ -80,11 +86,17 @@ public static boolean canCaptureJobParameter(String parameterName) {
     return allowedJobParams.contains(parameterName);
   }
 
+  /** Redact a value if the key or value matches the default redaction pattern. */
+  public static String redactValue(String key, String value) {
+    if (DEFAULT_REDACTION_PATTERN.matcher(key).find()
+        || DEFAULT_REDACTION_PATTERN.matcher(value).find()) {
+      return "[redacted]";
+    }
+    return value;
+  }
+
   public static List<Map.Entry<String, String>> getRedactedSparkConf(SparkConf conf) {
-    // Using values from
-    // https://github.com/apache/spark/blob/v3.5.1/core/src/main/scala/org/apache/spark/internal/config/package.scala#L1150-L1158
-    String redactionPattern =
-        conf.get("spark.redaction.regex", "(?i)secret|password|token|access.key|api.key");
+    String redactionPattern = conf.get("spark.redaction.regex", DEFAULT_REDACTION_REGEX);
     List<Map.Entry<String, String>> redacted = new ArrayList<>();
     Pattern pattern = Pattern.compile(redactionPattern);
 

dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/SparkLauncherAdvice.java

@@ -7,7 +7,6 @@
 import datadog.trace.bootstrap.instrumentation.api.AgentTracer;
 import java.lang.reflect.Field;
 import java.util.Map;
-import java.util.regex.Pattern;
 import net.bytebuddy.asm.Advice;
 import org.apache.spark.launcher.SparkAppHandle;
 import org.slf4j.Logger;
@@ -17,10 +16,6 @@ public class SparkLauncherAdvice {
 
   private static final Logger log = LoggerFactory.getLogger(SparkLauncherAdvice.class);
 
-  // Same default pattern as spark.redaction.regex in Spark source
-  private static final Pattern CONF_REDACTION_PATTERN =
-      Pattern.compile("(?i)secret|password|token|access.key|api.key");
-
   static volatile AgentSpan launcherSpan;
 
   private static volatile boolean shutdownHookRegistered = false;
@@ -55,11 +50,7 @@ private static void setLauncherConfigTags(AgentSpan span, Object launcher) {
         if (conf != null) {
           for (Map.Entry<String, String> entry : conf.entrySet()) {
             if (SparkConfAllowList.canCaptureJobParameter(entry.getKey())) {
-              String value = entry.getValue();
-              if (CONF_REDACTION_PATTERN.matcher(entry.getKey()).find()
-                  || CONF_REDACTION_PATTERN.matcher(value).find()) {
-                value = "[redacted]";
-              }
+              String value = SparkConfAllowList.redactValue(entry.getKey(), entry.getValue());
               span.setTag("config." + entry.getKey().replace('.', '_'), value);
             }
           }