finish launcher span with error via RunMainAdvice

Author: aboitreaud

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

@@ -106,6 +106,17 @@ public static void exit(@Advice.Thrown Throwable throwable) {
       if (AbstractDatadogSparkListener.listener != null) {
         AbstractDatadogSparkListener.listener.finishApplication(
             System.currentTimeMillis(), throwable, 0, null);
+      } else {
+        try {
+          Class<?> adviceClass =
+              Thread.currentThread()
+                  .getContextClassLoader()
+                  .loadClass("datadog.trace.instrumentation.spark.SparkLauncherAdvice");
+          java.lang.reflect.Method finishMethod =
+              adviceClass.getMethod("finishLauncherSpan", Throwable.class);
+          finishMethod.invoke(null, throwable);
+        } catch (Exception ignored) {
+        }
       }
     }
   }

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

@@ -26,7 +26,7 @@ public static synchronized void createLauncherSpan(String resource) {
 
     AgentTracer.TracerAPI tracer = AgentTracer.get();
     AgentSpan span =
-        tracer.buildSpan("spark.launcher").withSpanType("spark").withResourceName(resource).start();
+        tracer.buildSpan("spark.launcher.launch").withSpanType("spark").withResourceName(resource).start();
     span.setSamplingPriority(PrioritySampling.USER_KEEP, SamplingMechanism.DATA_JOBS);
     launcherSpan = span;
 
@@ -59,6 +59,18 @@ public static synchronized void finishLauncherSpan(int exitCode) {
     launcherSpan = null;
   }
 
+  public static synchronized void finishLauncherSpan(Throwable throwable) {
+    AgentSpan span = launcherSpan;
+    if (span == null) {
+      return;
+    }
+    if (throwable != null) {
+      span.addThrowable(throwable);
+    }
+    span.finish();
+    launcherSpan = null;
+  }
+
   public static class StartApplicationAdvice {
     @Advice.OnMethodExit(suppress = Throwable.class, onThrowable = Throwable.class)
     public static void exit(