Update tests with new attrs

Author: aboitreaud

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

@@ -17,6 +17,10 @@ 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");
+
   /** The launcher span, accessible from SparkExitAdvice via reflection. */
   public static volatile AgentSpan launcherSpan;
 
@@ -50,13 +54,11 @@ private static void setLauncherConfigTags(AgentSpan span, Object launcher) {
         @SuppressWarnings("unchecked")
         Map<String, String> conf = (Map<String, String>) confField.get(builder);
         if (conf != null) {
-          Pattern redactionPattern =
-              Pattern.compile("(?i)secret|password|token|access.key|api.key");
           for (Map.Entry<String, String> entry : conf.entrySet()) {
             if (SparkConfAllowList.canCaptureJobParameter(entry.getKey())) {
               String value = entry.getValue();
-              if (redactionPattern.matcher(entry.getKey()).find()
-                  || redactionPattern.matcher(value).find()) {
+              if (CONF_REDACTION_PATTERN.matcher(entry.getKey()).find()
+                  || CONF_REDACTION_PATTERN.matcher(value).find()) {
                 value = "[redacted]";
               }
               span.setTag("config." + entry.getKey().replace('.', '_'), value);

dd-java-agent/instrumentation/spark/spark-common/src/test/groovy/datadog/trace/instrumentation/spark/SparkLauncherTest.groovy

@@ -4,9 +4,74 @@ import datadog.trace.agent.test.InstrumentationSpecification
 import datadog.trace.api.sampling.PrioritySampling
 import datadog.trace.api.sampling.SamplingMechanism
 import datadog.trace.bootstrap.instrumentation.api.AgentTracer
+import org.apache.spark.launcher.SparkLauncher
 
 class SparkLauncherTest extends InstrumentationSpecification {
 
+  def "createLauncherSpan extracts config tags from SparkLauncher"() {
+    setup:
+    SparkLauncherAdvice.launcherSpan = null
+
+    when:
+    def launcher = new SparkLauncher()
+      .setMaster("yarn")
+      .setDeployMode("cluster")
+      .setAppName("test-app")
+      .setMainClass("com.example.Main")
+      .setAppResource("/path/to/app.jar")
+      .setConf("spark.executor.memory", "4g")
+      .setConf("spark.executor.instances", "10")
+    SparkLauncherAdvice.createLauncherSpan("SparkLauncher.startApplication", launcher)
+    SparkLauncherAdvice.finishLauncherSpan(0)
+
+    then:
+    assertTraces(1) {
+      trace(1) {
+        span {
+          operationName "spark.launcher.launch"
+          spanType "spark"
+          resourceName "SparkLauncher.startApplication"
+          errored false
+          assert span.tags["master"] == "yarn"
+          assert span.tags["deploy_mode"] == "cluster"
+          assert span.tags["application_name"] == "test-app"
+          assert span.tags["main_class"] == "com.example.Main"
+          assert span.tags["app_resource"] == "/path/to/app.jar"
+          assert span.tags["config.spark_executor_memory"] == "4g"
+          assert span.tags["config.spark_executor_instances"] == "10"
+        }
+      }
+    }
+  }
+
+  def "createLauncherSpan redacts sensitive conf values"() {
+    setup:
+    SparkLauncherAdvice.launcherSpan = null
+
+    when:
+    def launcher = new SparkLauncher()
+      // spark.app.name is allowlisted; its value contains "secret" so should be redacted
+      .setConf("spark.app.name", "my-secret-app")
+      // spark.master is allowlisted; its value is harmless so should pass through
+      .setConf("spark.master", "yarn")
+    SparkLauncherAdvice.createLauncherSpan("SparkLauncher.startApplication", launcher)
+    SparkLauncherAdvice.finishLauncherSpan(0)
+
+    then:
+    assertTraces(1) {
+      trace(1) {
+        span {
+          operationName "spark.launcher.launch"
+          spanType "spark"
+          resourceName "SparkLauncher.startApplication"
+          errored false
+          assert span.tags["config.spark_app_name"] == "[redacted]"
+          assert span.tags["config.spark_master"] == "yarn"
+        }
+      }
+    }
+  }
+
   def "generate spark.launcher span from startApplication"() {
     setup:
     SparkLauncherAdvice.launcherSpan = null