This is an automated email from the ASF dual-hosted git repository.
pvary pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/iceberg.git
The following commit(s) were added to refs/heads/main by this push:
new b07c1e570d Spark: Backport: Add Spark app name to env context for
Spark v3.4, 3.5, 4.0 (#14981)
b07c1e570d is described below
commit b07c1e570d5db28a937b3fc632ef2f2788932818
Author: Varun Lakhyani <[email protected]>
AuthorDate: Wed Jan 7 16:49:22 2026 +0530
Spark: Backport: Add Spark app name to env context for Spark v3.4, 3.5, 4.0
(#14981)
Backports #14976
---
.../apache/iceberg/spark/extensions/TestRewriteDataFilesProcedure.java | 1 +
.../spark/extensions/TestRewritePositionDeleteFilesProcedure.java | 1 +
.../v3.4/spark/src/main/java/org/apache/iceberg/spark/SparkCatalog.java | 1 +
.../apache/iceberg/spark/extensions/TestRewriteDataFilesProcedure.java | 1 +
.../spark/extensions/TestRewritePositionDeleteFilesProcedure.java | 1 +
.../v3.5/spark/src/main/java/org/apache/iceberg/spark/SparkCatalog.java | 1 +
.../apache/iceberg/spark/extensions/TestRewriteDataFilesProcedure.java | 1 +
.../spark/extensions/TestRewritePositionDeleteFilesProcedure.java | 1 +
.../v4.0/spark/src/main/java/org/apache/iceberg/spark/SparkCatalog.java | 1 +
9 files changed, 9 insertions(+)
diff --git
a/spark/v3.4/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/TestRewriteDataFilesProcedure.java
b/spark/v3.4/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/TestRewriteDataFilesProcedure.java
index 7ba9393534..d011ad0628 100644
---
a/spark/v3.4/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/TestRewriteDataFilesProcedure.java
+++
b/spark/v3.4/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/TestRewriteDataFilesProcedure.java
@@ -926,6 +926,7 @@ public class TestRewriteDataFilesProcedure extends
ExtensionsTestBase {
Map<String, String> summary = snapshotSummary();
assertThat(summary)
.containsKey(CatalogProperties.APP_ID)
+ .containsKey(CatalogProperties.APP_NAME)
.containsEntry(EnvironmentContext.ENGINE_NAME, "spark")
.hasEntrySatisfying(
EnvironmentContext.ENGINE_VERSION, v ->
assertThat(v).startsWith("3.4"));
diff --git
a/spark/v3.4/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/TestRewritePositionDeleteFilesProcedure.java
b/spark/v3.4/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/TestRewritePositionDeleteFilesProcedure.java
index bec5e06b37..0ff3a949ae 100644
---
a/spark/v3.4/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/TestRewritePositionDeleteFilesProcedure.java
+++
b/spark/v3.4/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/TestRewritePositionDeleteFilesProcedure.java
@@ -239,6 +239,7 @@ public class TestRewritePositionDeleteFilesProcedure
extends ExtensionsTestBase
Map<String, String> summary = snapshotSummary();
assertThat(summary)
.containsKey(CatalogProperties.APP_ID)
+ .containsKey(CatalogProperties.APP_NAME)
.containsEntry(EnvironmentContext.ENGINE_NAME, "spark")
.hasEntrySatisfying(
EnvironmentContext.ENGINE_VERSION, v ->
assertThat(v).startsWith("3.4"));
diff --git
a/spark/v3.4/spark/src/main/java/org/apache/iceberg/spark/SparkCatalog.java
b/spark/v3.4/spark/src/main/java/org/apache/iceberg/spark/SparkCatalog.java
index 0f49c54544..c07508568d 100644
--- a/spark/v3.4/spark/src/main/java/org/apache/iceberg/spark/SparkCatalog.java
+++ b/spark/v3.4/spark/src/main/java/org/apache/iceberg/spark/SparkCatalog.java
@@ -797,6 +797,7 @@ public class SparkCatalog extends BaseCatalog {
EnvironmentContext.put(
EnvironmentContext.ENGINE_VERSION,
sparkSession.sparkContext().version());
EnvironmentContext.put(CatalogProperties.APP_ID,
sparkSession.sparkContext().applicationId());
+ EnvironmentContext.put(CatalogProperties.APP_NAME,
sparkSession.sparkContext().appName());
}
@Override
diff --git
a/spark/v3.5/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/TestRewriteDataFilesProcedure.java
b/spark/v3.5/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/TestRewriteDataFilesProcedure.java
index ae88e04e44..00734dd1dc 100644
---
a/spark/v3.5/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/TestRewriteDataFilesProcedure.java
+++
b/spark/v3.5/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/TestRewriteDataFilesProcedure.java
@@ -978,6 +978,7 @@ public class TestRewriteDataFilesProcedure extends
ExtensionsTestBase {
Map<String, String> summary = snapshotSummary();
assertThat(summary)
.containsKey(CatalogProperties.APP_ID)
+ .containsKey(CatalogProperties.APP_NAME)
.containsEntry(EnvironmentContext.ENGINE_NAME, "spark")
.hasEntrySatisfying(
EnvironmentContext.ENGINE_VERSION, v ->
assertThat(v).startsWith("3.5"));
diff --git
a/spark/v3.5/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/TestRewritePositionDeleteFilesProcedure.java
b/spark/v3.5/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/TestRewritePositionDeleteFilesProcedure.java
index eae9208022..feafaff27b 100644
---
a/spark/v3.5/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/TestRewritePositionDeleteFilesProcedure.java
+++
b/spark/v3.5/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/TestRewritePositionDeleteFilesProcedure.java
@@ -239,6 +239,7 @@ public class TestRewritePositionDeleteFilesProcedure
extends ExtensionsTestBase
Map<String, String> summary = snapshotSummary();
assertThat(summary)
.containsKey(CatalogProperties.APP_ID)
+ .containsKey(CatalogProperties.APP_NAME)
.containsEntry(EnvironmentContext.ENGINE_NAME, "spark")
.hasEntrySatisfying(
EnvironmentContext.ENGINE_VERSION, v ->
assertThat(v).startsWith("3.5"));
diff --git
a/spark/v3.5/spark/src/main/java/org/apache/iceberg/spark/SparkCatalog.java
b/spark/v3.5/spark/src/main/java/org/apache/iceberg/spark/SparkCatalog.java
index 5e1cd97795..913fe25e6d 100644
--- a/spark/v3.5/spark/src/main/java/org/apache/iceberg/spark/SparkCatalog.java
+++ b/spark/v3.5/spark/src/main/java/org/apache/iceberg/spark/SparkCatalog.java
@@ -797,6 +797,7 @@ public class SparkCatalog extends BaseCatalog {
EnvironmentContext.put(
EnvironmentContext.ENGINE_VERSION,
sparkSession.sparkContext().version());
EnvironmentContext.put(CatalogProperties.APP_ID,
sparkSession.sparkContext().applicationId());
+ EnvironmentContext.put(CatalogProperties.APP_NAME,
sparkSession.sparkContext().appName());
}
@Override
diff --git
a/spark/v4.0/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/TestRewriteDataFilesProcedure.java
b/spark/v4.0/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/TestRewriteDataFilesProcedure.java
index 3aabd635bb..15bbfb02eb 100644
---
a/spark/v4.0/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/TestRewriteDataFilesProcedure.java
+++
b/spark/v4.0/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/TestRewriteDataFilesProcedure.java
@@ -976,6 +976,7 @@ public class TestRewriteDataFilesProcedure extends
ExtensionsTestBase {
Map<String, String> summary = snapshotSummary();
assertThat(summary)
.containsKey(CatalogProperties.APP_ID)
+ .containsKey(CatalogProperties.APP_NAME)
.containsEntry(EnvironmentContext.ENGINE_NAME, "spark")
.hasEntrySatisfying(
EnvironmentContext.ENGINE_VERSION, v ->
assertThat(v).startsWith("4.0"));
diff --git
a/spark/v4.0/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/TestRewritePositionDeleteFilesProcedure.java
b/spark/v4.0/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/TestRewritePositionDeleteFilesProcedure.java
index 4a6d2ff197..006379adda 100644
---
a/spark/v4.0/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/TestRewritePositionDeleteFilesProcedure.java
+++
b/spark/v4.0/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/TestRewritePositionDeleteFilesProcedure.java
@@ -239,6 +239,7 @@ public class TestRewritePositionDeleteFilesProcedure
extends ExtensionsTestBase
Map<String, String> summary = snapshotSummary();
assertThat(summary)
.containsKey(CatalogProperties.APP_ID)
+ .containsKey(CatalogProperties.APP_NAME)
.containsEntry(EnvironmentContext.ENGINE_NAME, "spark")
.hasEntrySatisfying(
EnvironmentContext.ENGINE_VERSION, v ->
assertThat(v).startsWith("4.0"));
diff --git
a/spark/v4.0/spark/src/main/java/org/apache/iceberg/spark/SparkCatalog.java
b/spark/v4.0/spark/src/main/java/org/apache/iceberg/spark/SparkCatalog.java
index dba3ea6ecc..da22607d05 100644
--- a/spark/v4.0/spark/src/main/java/org/apache/iceberg/spark/SparkCatalog.java
+++ b/spark/v4.0/spark/src/main/java/org/apache/iceberg/spark/SparkCatalog.java
@@ -797,6 +797,7 @@ public class SparkCatalog extends BaseCatalog {
EnvironmentContext.put(
EnvironmentContext.ENGINE_VERSION,
sparkSession.sparkContext().version());
EnvironmentContext.put(CatalogProperties.APP_ID,
sparkSession.sparkContext().applicationId());
+ EnvironmentContext.put(CatalogProperties.APP_NAME,
sparkSession.sparkContext().appName());
}
@Override
