Skip to content

Fix tracer OpenLineage instrumentation #9487

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+31 −3
Open

Fix tracer OpenLineage instrumentation #9487

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 31 additions & 3 deletions ...spark/src/main/java/datadog/trace/instrumentation/spark/AbstractDatadogSparkListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import datadog.trace.api.BaseHash;
import datadog.trace.api.Config;
import datadog.trace.api.DDTags;
import datadog.trace.api.DDTraceId;
Expand Down Expand Up @@ -180,7 +181,9 @@ public void setupOpenLineage(DDTraceId traceId) {
"_dd.trace_id:"
+ traceId.toString()
+ ";_dd.ol_intake.emit_spans:false;_dd.ol_service:"
+ sparkServiceName
+ getServiceForOpenLineage(sparkConf, isRunningOnDatabricks)
+ ";_dd.ol_intake.base_hash:"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks for adding that, but actually given that you support also container tags, it would be better to skip the base hash and add directly the process tags .
These are currently enabled for jvm 21 and will be enabled by default on next version

+ BaseHash.getBaseHashStr()
+ ";_dd.ol_app_id:"
+ appId);
return;
Expand Down Expand Up @@ -669,6 +672,9 @@ public void onTaskEnd(SparkListenerTaskEnd taskEnd) {
}
}

// OpenLineage call should be prior to method return statements
notifyOl(x -> openLineageSparkListener.onTaskEnd(x), taskEnd);

// Only sending failing tasks
if (!(taskEnd.reason() instanceof TaskFailedReason)) {
return;
Expand All @@ -687,8 +693,6 @@ public void onTaskEnd(SparkListenerTaskEnd taskEnd) {

Properties props = stageProperties.get(stageSpanKey);
sendTaskSpan(stageSpan, taskEnd, props);

notifyOl(x -> openLineageSparkListener.onTaskEnd(x), taskEnd);
}

public static boolean classIsLoadable(String className) {
Expand Down Expand Up @@ -1292,6 +1296,30 @@ private static String getSparkServiceName(SparkConf conf, boolean isRunningOnDat
return sparkAppName;
}

private static String getServiceForOpenLineage(SparkConf conf, boolean isRunningOnDatabricks) {
// Service for OpenLineage in Databricks is not supported yet
if (isRunningOnDatabricks) {
return null;
}

// Keep service set by user, except if it is only "spark" or "hadoop" that can be set by USM
String serviceName = Config.get().getServiceName();
if (Config.get().isServiceNameSetByUser()
&& !"spark".equals(serviceName)
&& !"hadoop".equals(serviceName)) {
log.debug("Service '{}' explicitly set by user, not using the application name", serviceName);
return serviceName;
}

String sparkAppName = conf.get("spark.app.name", null);
if (sparkAppName != null) {
log.info(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this one be log.debug() too?

"Using Spark application name '{}' as the Datadog service for OpenLineage", sparkAppName);
}

return sparkAppName;
}

private static void reportKafkaOffsets(
final String appName, final AgentSpan span, final SourceProgress progress) {
if (!traceConfig().isDataStreamsEnabled()
Expand Down
Loading