From a83a5369938d83f10e7760bacfb1423b76de6e62 Mon Sep 17 00:00:00 2001 From: Jiang Zhu Date: Fri, 5 Dec 2025 06:46:32 -0800 Subject: [PATCH 1/2] Temporary disable a few unit tests in SpannerChangeStreamErrorTest (#37003) --- .../spanner/changestreams/SpannerChangeStreamErrorTest.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/spanner/changestreams/SpannerChangeStreamErrorTest.java b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/spanner/changestreams/SpannerChangeStreamErrorTest.java index 8adc927b4f29..835ca0a0f5a8 100644 --- a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/spanner/changestreams/SpannerChangeStreamErrorTest.java +++ b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/spanner/changestreams/SpannerChangeStreamErrorTest.java @@ -70,6 +70,7 @@ import org.joda.time.Duration; import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; @@ -115,6 +116,7 @@ public void tearDown() throws NoSuchFieldException, IllegalAccessException { } @Test + @Ignore("https://github.com/apache/beam/issues/37002 Re-enable skipped tests.") // Error code UNAVAILABLE is retried repeatedly until the RPC times out. public void testUnavailableExceptionRetries() throws InterruptedException { DirectOptions options = PipelineOptionsFactory.as(DirectOptions.class); @@ -155,6 +157,7 @@ public void testUnavailableExceptionRetries() throws InterruptedException { } @Test + @Ignore("https://github.com/apache/beam/issues/37002 Re-enable skipped tests.") // Error code ABORTED is retried repeatedly until it times out. public void testAbortedExceptionRetries() throws InterruptedException { mockSpannerService.setExecuteStreamingSqlExecutionTime( @@ -218,6 +221,7 @@ public void testUnknownExceptionDoesNotRetry() { } @Test + @Ignore("https://github.com/apache/beam/issues/37002 Re-enable skipped tests.") // Error code RESOURCE_EXHAUSTED is retried repeatedly. public void testResourceExhaustedRetry() { mockSpannerService.setExecuteStreamingSqlExecutionTime( @@ -281,6 +285,7 @@ public void testResourceExhaustedRetryWithDefaultSettings() { } @Test + @Ignore("https://github.com/apache/beam/issues/37002 Re-enable skipped tests.") public void testInvalidRecordReceived() { final Timestamp startTimestamp = Timestamp.ofTimeSecondsAndNanos(0, 1000); final Timestamp endTimestamp = From 9abc6906b45352c013156a00eb7b0efb363d0572 Mon Sep 17 00:00:00 2001 From: Shunping Huang Date: Fri, 5 Dec 2025 15:10:38 -0500 Subject: [PATCH 2/2] Update spanner client version. (#36995) * Update spanner client version. * Edit comments with a new issue id. --- .../groovy/org/apache/beam/gradle/BeamModulePlugin.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy index 595741f8efe4..5803f8b19c46 100644 --- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy @@ -612,8 +612,8 @@ class BeamModulePlugin implements Plugin { def google_ads_version = "33.0.0" def google_clients_version = "2.0.0" def google_cloud_bigdataoss_version = "2.2.26" - // [bomupgrader] TODO(#35868): currently pinned, should be determined by: com.google.cloud:google-cloud-spanner, consistent with: google_cloud_platform_libraries_bom - def google_cloud_spanner_version = "6.95.1" + // [bomupgrader] TODO(#37008): currently pinned before gcp-bom moving beyond this version, should be determined by: com.google.cloud:google-cloud-spanner, consistent with: google_cloud_platform_libraries_bom + def google_cloud_spanner_version = "6.104.0" def google_code_gson_version = "2.10.1" def google_oauth_clients_version = "1.34.1" // [bomupgrader] determined by: io.grpc:grpc-netty, consistent with: google_cloud_platform_libraries_bom