Skip to content

Support Spark 4.1 by removing mention to StreamExecution class #10228

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

Merged
aboitreaud merged 2 commits into from
Dec 17, 2025
Merged

Support Spark 4.1 by removing mention to StreamExecution class #10228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d4b5730
Do not rely on StreamExecution class
aboitreaud Dec 16, 2025
1357168
re-enable Spark 4.1 in CI
aboitreaud Dec 17, 2025
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
1 change: 0 additions & 1 deletion dd-java-agent/instrumentation/spark/spark_2.13/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ muzzle {
group = "org.apache.spark"
module = "spark-sql_$scalaVersion"
versions = "[4.0.0,)"
skipVersions += "4.1.0" // FIXME: Temporary skip `4.1.0` as we need more time to support it.
javaVersion = 17
}
}
Expand Down
3 changes: 1 addition & 2 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 @@ -58,7 +58,6 @@
import org.apache.spark.sql.execution.SQLExecution;
import org.apache.spark.sql.execution.SparkPlanInfo;
import org.apache.spark.sql.execution.metric.SQLMetricInfo;
import org.apache.spark.sql.execution.streaming.StreamExecution;
import org.apache.spark.sql.execution.ui.SparkListenerSQLExecutionEnd;
import org.apache.spark.sql.execution.ui.SparkListenerSQLExecutionStart;
import org.apache.spark.sql.streaming.SourceProgress;
Expand Down Expand Up @@ -1264,7 +1263,7 @@ private static String getStreamingBatchKey(Properties properties) {
return null;
}

Object queryId = properties.get(StreamExecution.QUERY_ID_KEY());
Object queryId = properties.get("sql.streaming.queryId");
Object batchId = properties.get("streaming.sql.batchId");

if (queryId == null || batchId == null) {
Expand Down