Skip to content

Commit 1d3d147

Browse files
committed
fixing an error + adding right logs
1 parent fb1450e commit 1d3d147

1 file changed

Lines changed: 15 additions & 3 deletions

File tree

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

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -254,10 +254,7 @@ private void initApplicationSpanIfNotInitialized() {
254254
}
255255

256256
log.debug("Starting tracer application span.");
257-
log.debug(databricksClusterName);
258257
if (!isRunningOnDatabricks) {
259-
String databricksClusterNameSpark = databricksClusterName + "creating a spark.app";
260-
log.debug(databricksClusterNameSpark);
261258
AgentTracer.SpanBuilder builder = buildSparkSpan("spark.application", null);
262259

263260
if (applicationStart != null) {
@@ -332,13 +329,28 @@ public synchronized void finishApplication(
332329
}
333330
applicationEnded = true;
334331

332+
log.info(
333+
"finishApplication: isRunningOnDatabricks={}, databricksClusterName={}, applicationSpan={}, jobCount={}",
334+
isRunningOnDatabricks,
335+
databricksClusterName,
336+
applicationSpan != null ? "exists" : "null",
337+
jobCount);
338+
335339
if (applicationSpan == null && jobCount > 0) {
336340
// If the application span is not initialized, but spark jobs have been executed, all those
337341
// spark jobs were databricks or streaming. In this case we don't send the application span
338342
return;
339343
}
340344
initApplicationSpanIfNotInitialized();
341345

346+
if (applicationSpan == null) {
347+
// On Databricks or streaming environments, the application span is not created.
348+
// Flush any remaining traces and return.
349+
log.info("No application span created, skipping. isRunningOnDatabricks={}", isRunningOnDatabricks);
350+
tracer.flush();
351+
return;
352+
}
353+
342354
if (throwable != null) {
343355
applicationSpan.addThrowable(throwable);
344356
} else if (exitCode != 0) {

0 commit comments

Comments
 (0)