edits logs and added statments

Author: larakulkarni1

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

@@ -233,9 +233,6 @@ public void setupOpenLineage(DDTraceId traceId) {
   public synchronized void onApplicationStart(SparkListenerApplicationStart applicationStart) {
     this.applicationStart = applicationStart;
 
-    if (isRunningOnDatabricks) {
-      log.info("databricksClusterName{}", databricksClusterName);
-    }
     if (openLineageSparkListener == null) {
       openLineageSparkListener =
           InstanceStore.of(SparkListenerInterface.class).get("openLineageListener");
@@ -249,7 +246,6 @@ public synchronized void onApplicationStart(SparkListenerApplicationStart applic
               .orElse(predeterminedTraceIdContext.getTraceId()));
     }
     notifyOl(x -> openLineageSparkListener.onApplicationStart(x), applicationStart);
-    log.info("end of application start");
   }
 
   private void initApplicationSpanIfNotInitialized() {
@@ -258,25 +254,25 @@ private void initApplicationSpanIfNotInitialized() {
     }
 
     log.debug("Starting tracer application span.");
-      AgentTracer.SpanBuilder builder = buildSparkSpan("spark.application", null);
-
-      if (applicationStart != null) {
-        String ddTags =
-            Config.get().getGlobalTags().entrySet().stream()
-                .sorted(Map.Entry.comparingByKey())
-                .map(e -> e.getKey() + ":" + e.getValue())
-                .collect(Collectors.joining(","));
-
-        builder
-            .withStartTimestamp(applicationStart.time() * 1000)
-            .withTag("application_name", applicationStart.appName())
-            .withTag("djm.tags", ddTags)
-            .withTag("spark_user", applicationStart.sparkUser());
-
-        if (applicationStart.appAttemptId().isDefined()) {
-          builder.withTag("app_attempt_id", applicationStart.appAttemptId().get());
-        }
+    AgentTracer.SpanBuilder builder = buildSparkSpan("spark.application", null);
+
+    if (applicationStart != null) {
+      String ddTags =
+          Config.get().getGlobalTags().entrySet().stream()
+              .sorted(Map.Entry.comparingByKey())
+              .map(e -> e.getKey() + ":" + e.getValue())
+              .collect(Collectors.joining(","));
+
+      builder
+          .withStartTimestamp(applicationStart.time() * 1000)
+          .withTag("application_name", applicationStart.appName())
+          .withTag("djm.tags", ddTags)
+          .withTag("spark_user", applicationStart.sparkUser());
+
+      if (applicationStart.appAttemptId().isDefined()) {
+        builder.withTag("app_attempt_id", applicationStart.appAttemptId().get());
       }
+    }
 
       captureApplicationParameters(builder);
       captureEmrStepId(builder);
@@ -312,9 +308,6 @@ private void captureOpenlineageContextIfPresent(
 
   @Override
   public void onApplicationEnd(SparkListenerApplicationEnd applicationEnd) {
-    if (isRunningOnDatabricks) {
-      log.info("On Application End");
-    }
     log.info(
         "Received spark application end event, finish trace on this event: {}",
         finishTraceOnApplicationEnd);
@@ -330,6 +323,10 @@ public void onApplicationEnd(SparkListenerApplicationEnd applicationEnd) {
   public synchronized void finishApplication(
       long time, Throwable throwable, int exitCode, String msg) {
     log.info("Finishing spark application trace");
+
+    if(applicationEnded){
+      return;
+    }
     applicationEnded = true;
 
     if (applicationSpan == null && jobCount > 0) {