Skip to content

Fix EMR Spark support by using Seq instead of ArrayBuffer for externa… #10987

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
gh-worker-dd-mergequeue-cf854d merged 1 commit into from
Mar 30, 2026
Merged

Fix EMR Spark support by using Seq instead of ArrayBuffer for externa… #10987

Show file tree
Hide file tree
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
5 changes: 4 additions & 1 deletion ...spark_2.12/src/main/java/datadog/trace/instrumentation/spark/DatadogSpark212Listener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import org.apache.spark.util.AccumulatorV2;
import scala.Function1;
import scala.collection.JavaConverters;
import scala.collection.Seq;
import scala.collection.mutable.ArrayBuffer;

/**
Expand Down Expand Up @@ -91,7 +92,9 @@ protected List<AccumulatorV2> getExternalAccumulators(TaskMetrics metrics) {
}

// withExternalAccums didn't work, try the legacy method
ArrayBuffer<AccumulatorV2> accumulators = methodLoader.invoke(externalAccums, metrics);
// Use Seq (not ArrayBuffer) since some Spark distributions (e.g. Amazon EMR) return a
// JListWrapper which implements Seq but cannot be cast to ArrayBuffer
Seq<AccumulatorV2> accumulators = methodLoader.invoke(externalAccums, metrics);
if (accumulators != null && !accumulators.isEmpty()) {
return JavaConverters.seqAsJavaList(accumulators);
}
Expand Down
5 changes: 4 additions & 1 deletion ...spark_2.13/src/main/java/datadog/trace/instrumentation/spark/DatadogSpark213Listener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import org.apache.spark.sql.execution.metric.SQLMetricInfo;
import org.apache.spark.util.AccumulatorV2;
import scala.Function1;
import scala.collection.Seq;
import scala.collection.mutable.ArrayBuffer;
import scala.jdk.javaapi.CollectionConverters;

Expand Down Expand Up @@ -91,7 +92,9 @@ protected List<AccumulatorV2> getExternalAccumulators(TaskMetrics metrics) {
}

// withExternalAccums didn't work, try the legacy method
ArrayBuffer<AccumulatorV2> accumulators = methodLoader.invoke(externalAccums, metrics);
// Use Seq (not ArrayBuffer) since some Spark distributions (e.g. Amazon EMR) return a
// JListWrapper which implements Seq but cannot be cast to ArrayBuffer
Seq<AccumulatorV2> accumulators = methodLoader.invoke(externalAccums, metrics);
if (accumulators != null && !accumulators.isEmpty()) {
return CollectionConverters.asJava(accumulators);
}
Expand Down
Loading