From 8156ef31d93932c14f9fdd13c8c5e5b7ce370ba5 Mon Sep 17 00:00:00 2001 From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com> Date: Fri, 8 Aug 2025 02:49:50 -0400 Subject: [PATCH 1/7] chore: Update generation configuration at Fri Aug 8 02:42:47 UTC 2025 (#4007) * chore: Update generation configuration at Thu Jul 31 02:40:47 UTC 2025 * chore: Update generation configuration at Fri Aug 1 02:49:18 UTC 2025 * chore: Update generation configuration at Sat Aug 2 02:37:24 UTC 2025 * chore: generate libraries at Sat Aug 2 02:37:56 UTC 2025 * chore: Update generation configuration at Tue Aug 5 02:43:25 UTC 2025 * chore: generate libraries at Tue Aug 5 02:43:53 UTC 2025 * chore: Update generation configuration at Wed Aug 6 02:42:04 UTC 2025 * chore: Update generation configuration at Thu Aug 7 02:43:07 UTC 2025 * chore: Update generation configuration at Fri Aug 8 02:42:47 UTC 2025 --- .github/scripts/update_generation_config.sh | 2 +- .github/workflows/hermetic_library_generation.yaml | 2 +- .kokoro/presubmit/graalvm-native-a.cfg | 2 +- .kokoro/presubmit/graalvm-native-b.cfg | 2 +- .kokoro/presubmit/graalvm-native-c.cfg | 2 +- README.md | 2 +- generation_config.yaml | 6 +++--- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/scripts/update_generation_config.sh b/.github/scripts/update_generation_config.sh index 3b890a76b24..92efcf88191 100644 --- a/.github/scripts/update_generation_config.sh +++ b/.github/scripts/update_generation_config.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -e +set -ex # This script should be run at the root of the repository. # This script is used to update googleapis_commitish, gapic_generator_version, # and libraries_bom_version in generation configuration at the time of running diff --git a/.github/workflows/hermetic_library_generation.yaml b/.github/workflows/hermetic_library_generation.yaml index 5912d6f0691..5a97a438023 100644 --- a/.github/workflows/hermetic_library_generation.yaml +++ b/.github/workflows/hermetic_library_generation.yaml @@ -37,7 +37,7 @@ jobs: with: fetch-depth: 0 token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }} - - uses: googleapis/sdk-platform-java/.github/scripts@v2.60.2 + - uses: googleapis/sdk-platform-java/.github/scripts@v2.61.0 if: env.SHOULD_RUN == 'true' with: base_ref: ${{ github.base_ref }} diff --git a/.kokoro/presubmit/graalvm-native-a.cfg b/.kokoro/presubmit/graalvm-native-a.cfg index 96b4fed86fb..783727ef010 100644 --- a/.kokoro/presubmit/graalvm-native-a.cfg +++ b/.kokoro/presubmit/graalvm-native-a.cfg @@ -3,7 +3,7 @@ # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.50.2" # {x-version-update:google-cloud-shared-dependencies:current} + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.51.0" # {x-version-update:google-cloud-shared-dependencies:current} } env_vars: { diff --git a/.kokoro/presubmit/graalvm-native-b.cfg b/.kokoro/presubmit/graalvm-native-b.cfg index 76f04833149..83c7afee079 100644 --- a/.kokoro/presubmit/graalvm-native-b.cfg +++ b/.kokoro/presubmit/graalvm-native-b.cfg @@ -3,7 +3,7 @@ # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.50.2" # {x-version-update:google-cloud-shared-dependencies:current} + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.51.0" # {x-version-update:google-cloud-shared-dependencies:current} } env_vars: { diff --git a/.kokoro/presubmit/graalvm-native-c.cfg b/.kokoro/presubmit/graalvm-native-c.cfg index 277aa2338dd..3a9bbf8c3ab 100644 --- a/.kokoro/presubmit/graalvm-native-c.cfg +++ b/.kokoro/presubmit/graalvm-native-c.cfg @@ -3,7 +3,7 @@ # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.50.2" # {x-version-update:google-cloud-shared-dependencies:current} + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.51.0" # {x-version-update:google-cloud-shared-dependencies:current} } env_vars: { diff --git a/README.md b/README.md index c070f6736fd..88b491710fc 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ If you are using Maven without the BOM, add this to your dependencies: If you are using Gradle 5.x or later, add this to your dependencies: ```Groovy -implementation platform('com.google.cloud:libraries-bom:26.64.0') +implementation platform('com.google.cloud:libraries-bom:26.65.0') implementation 'com.google.cloud:google-cloud-spanner' ``` diff --git a/generation_config.yaml b/generation_config.yaml index 6e9f454655f..465bb6d22e6 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,6 +1,6 @@ -gapic_generator_version: 2.60.2 -googleapis_commitish: 64e82d17e410ff5e71ab3e040ea393db362f2850 -libraries_bom_version: 26.64.0 +gapic_generator_version: 2.61.0 +googleapis_commitish: c5334a83d6966439a2273a4ef64e6779ffba97a1 +libraries_bom_version: 26.65.0 libraries: - api_shortname: spanner name_pretty: Cloud Spanner From 1a4adb4d70c3a3822fa6bda93d689f2dae1835fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Knut=20Olav=20L=C3=B8ite?= Date: Fri, 8 Aug 2025 14:34:10 +0200 Subject: [PATCH 2/7] fix: add missing span.end calls for AsyncTransactionManager (#4012) The AsyncTransactionManager did not end the span when the transaction was committed or rolled back. This caused the spans not to be collected and exported. --- .../spanner/AsyncTransactionManagerImpl.java | 11 ++++ .../spanner/OpenTelemetryApiTracerTest.java | 55 +++++++++++++++++++ 2 files changed, 66 insertions(+) diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/AsyncTransactionManagerImpl.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/AsyncTransactionManagerImpl.java index c5599a749f6..ebba9fa9e17 100644 --- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/AsyncTransactionManagerImpl.java +++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/AsyncTransactionManagerImpl.java @@ -165,12 +165,19 @@ public void onFailure(Throwable t) { txnState = TransactionState.ABORTED; } else { txnState = TransactionState.COMMIT_FAILED; + if (span != null) { + span.setStatus(t); + span.end(); + } commitResponse.setException(t); } } @Override public void onSuccess(CommitResponse result) { + if (span != null) { + span.end(); + } commitResponse.set(result); } }, @@ -190,6 +197,10 @@ public ApiFuture rollbackAsync() { ignored -> ApiFutures.immediateFuture(null), MoreExecutors.directExecutor()); } finally { + if (span != null) { + span.addAnnotation("Transaction rolled back"); + span.end(); + } txnState = TransactionState.ROLLED_BACK; } } diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/OpenTelemetryApiTracerTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/OpenTelemetryApiTracerTest.java index 65bb5f5f0d7..67012ed9622 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/OpenTelemetryApiTracerTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/OpenTelemetryApiTracerTest.java @@ -27,11 +27,14 @@ import com.google.api.gax.longrunning.OperationTimedPollAlgorithm; import com.google.api.gax.retrying.RetrySettings; import com.google.cloud.NoCredentials; +import com.google.cloud.spanner.AsyncTransactionManager.CommitTimestampFuture; +import com.google.cloud.spanner.AsyncTransactionManager.TransactionContextFuture; import com.google.cloud.spanner.MockSpannerServiceImpl.SimulatedExecutionTime; import com.google.cloud.spanner.MockSpannerServiceImpl.StatementResult; import com.google.cloud.spanner.SpannerOptions.SpannerEnvironment; import com.google.cloud.spanner.connection.RandomResultSetGenerator; import com.google.common.collect.ImmutableList; +import com.google.common.util.concurrent.MoreExecutors; import com.google.spanner.admin.database.v1.UpdateDatabaseDdlMetadata; import io.grpc.Status; import io.opentelemetry.api.GlobalOpenTelemetry; @@ -451,6 +454,58 @@ public boolean isEnableApiTracing() { "CloudSpannerOperation.ExecuteStreamingQuery", "Spanner.ExecuteStreamingSql", spans); } + @Test + public void testAsyncTransactionManagerCommit() throws Exception { + try (AsyncTransactionManager manager = client.transactionManagerAsync()) { + TransactionContextFuture transactionFuture = manager.beginAsync(); + CommitTimestampFuture commitTimestamp = + transactionFuture + .then( + (transaction, __) -> transaction.executeUpdateAsync(UPDATE_RANDOM), + MoreExecutors.directExecutor()) + .commitAsync(); + commitTimestamp.get(); + } + + assertEquals(CompletableResultCode.ofSuccess(), spanExporter.flush()); + List spans = spanExporter.getFinishedSpanItems(); + assertContains("CloudSpanner.ReadWriteTransaction", spans); + assertContains("CloudSpannerOperation.ExecuteUpdate", spans); + assertContains("CloudSpannerOperation.Commit", spans); + assertContains("Spanner.ExecuteSql", spans); + assertContains("Spanner.Commit", spans); + + assertParent("CloudSpanner.ReadWriteTransaction", "CloudSpannerOperation.ExecuteUpdate", spans); + assertParent("CloudSpanner.ReadWriteTransaction", "CloudSpannerOperation.Commit", spans); + assertParent("CloudSpannerOperation.ExecuteUpdate", "Spanner.ExecuteSql", spans); + } + + @Test + public void testAsyncTransactionManagerRollback() throws Exception { + try (AsyncTransactionManager manager = client.transactionManagerAsync()) { + TransactionContextFuture transactionFuture = manager.beginAsync(); + transactionFuture + .then( + (transaction, __) -> transaction.executeUpdateAsync(UPDATE_RANDOM), + MoreExecutors.directExecutor()) + .get(); + manager.rollbackAsync().get(); + } + + assertEquals(CompletableResultCode.ofSuccess(), spanExporter.flush()); + List spans = spanExporter.getFinishedSpanItems(); + assertContains("CloudSpanner.ReadWriteTransaction", spans); + assertContains("CloudSpannerOperation.ExecuteUpdate", spans); + assertContains("Spanner.ExecuteSql", spans); + assertContains("Spanner.Rollback", spans); + + assertParent("CloudSpanner.ReadWriteTransaction", "CloudSpannerOperation.ExecuteUpdate", spans); + assertParent("CloudSpannerOperation.ExecuteUpdate", "Spanner.ExecuteSql", spans); + SpanData transactionSpan = getSpan("CloudSpanner.ReadWriteTransaction", spans); + assertNotNull(transactionSpan); + assertContainsEvent("Transaction rolled back", transactionSpan.getEvents()); + } + void assertContains(String expected, List spans) { assertTrue( "Expected " + spansToString(spans) + " to contain " + expected, From 35100b4e2a591a9ea8133cded24d236576ad85c5 Mon Sep 17 00:00:00 2001 From: Sakthivel Subramanian <179120858+sakthivelmanii@users.noreply.github.com> Date: Fri, 8 Aug 2025 18:19:28 +0530 Subject: [PATCH 3/7] chore: Revert patched emulator tests (#4011) --- .../com/google/cloud/spanner/it/ITJsonWriteReadTest.java | 7 ++++--- .../test/java/com/google/cloud/spanner/it/ITWriteTest.java | 6 ++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITJsonWriteReadTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITJsonWriteReadTest.java index 098f9244f55..026e3649b2e 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITJsonWriteReadTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITJsonWriteReadTest.java @@ -16,7 +16,6 @@ package com.google.cloud.spanner.it; -import static com.google.cloud.spanner.testing.EmulatorSpannerHelper.isUsingEmulator; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThrows; @@ -133,8 +132,10 @@ public void testWriteAndReadInvalidJsonValues() throws IOException { .to(Value.json(jsonStr)) .build()))); - if (env.getTestHelper().getOptions().getSessionPoolOptions().getUseMultiplexedSessionForRW() - && !isUsingEmulator()) { + if (env.getTestHelper() + .getOptions() + .getSessionPoolOptions() + .getUseMultiplexedSessionForRW()) { assertEquals(ErrorCode.INVALID_ARGUMENT, exception.getErrorCode()); } else { assertEquals(ErrorCode.FAILED_PRECONDITION, exception.getErrorCode()); diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITWriteTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITWriteTest.java index 9e30efb80d8..5dde683bcb8 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITWriteTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITWriteTest.java @@ -1081,8 +1081,10 @@ public void incorrectType() { write(baseInsert().set("StringValue").to(1.234).build()); fail("Expected exception"); } catch (SpannerException ex) { - if (env.getTestHelper().getOptions().getSessionPoolOptions().getUseMultiplexedSessionForRW() - && !isUsingEmulator()) { + if (env.getTestHelper() + .getOptions() + .getSessionPoolOptions() + .getUseMultiplexedSessionForRW()) { assertThat(ex.getErrorCode()).isEqualTo(ErrorCode.INVALID_ARGUMENT); } else { assertThat(ex.getErrorCode()).isEqualTo(ErrorCode.FAILED_PRECONDITION); From 4e90c29ce3447d14411368e45a39c7b0965cb40a Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Sun, 10 Aug 2025 05:51:26 +0200 Subject: [PATCH 4/7] deps: update dependency com.google.cloud:sdk-platform-java-config to v3.51.0 (#4013) --- .github/workflows/unmanaged_dependency_check.yaml | 2 +- google-cloud-spanner-bom/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml index d8d1ba1599e..bf6614a5cde 100644 --- a/.github/workflows/unmanaged_dependency_check.yaml +++ b/.github/workflows/unmanaged_dependency_check.yaml @@ -17,6 +17,6 @@ jobs: # repository .kokoro/build.sh - name: Unmanaged dependency check - uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.50.2 + uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.51.0 with: bom-path: google-cloud-spanner-bom/pom.xml diff --git a/google-cloud-spanner-bom/pom.xml b/google-cloud-spanner-bom/pom.xml index 14fcc0a2849..b962dc8571f 100644 --- a/google-cloud-spanner-bom/pom.xml +++ b/google-cloud-spanner-bom/pom.xml @@ -8,7 +8,7 @@ com.google.cloud sdk-platform-java-config - 3.50.2 + 3.51.0 Google Cloud Spanner BOM diff --git a/pom.xml b/pom.xml index f518abd229f..1e78902769b 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ com.google.cloud sdk-platform-java-config - 3.50.2 + 3.51.0 From f00a453178de3f3b235c9028fc52609996bdeb8c Mon Sep 17 00:00:00 2001 From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com> Date: Sat, 9 Aug 2025 23:51:45 -0400 Subject: [PATCH 5/7] chore: Update generation configuration at Sun Aug 10 02:44:46 UTC 2025 (#4014) * chore: Update generation configuration at Sat Aug 9 02:33:01 UTC 2025 * chore: Update generation configuration at Sun Aug 10 02:44:46 UTC 2025 --- generation_config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generation_config.yaml b/generation_config.yaml index 465bb6d22e6..b0d9f4d2412 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,5 +1,5 @@ gapic_generator_version: 2.61.0 -googleapis_commitish: c5334a83d6966439a2273a4ef64e6779ffba97a1 +googleapis_commitish: 07d9064dde02424bc0166c04ac6582e0922f89f9 libraries_bom_version: 26.65.0 libraries: - api_shortname: spanner From c6292eebfd2f05aaca5fed6cd447273663d379b6 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 11 Aug 2025 22:02:14 +0530 Subject: [PATCH 6/7] chore(main): release 6.98.1-SNAPSHOT (#4009) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- benchmarks/pom.xml | 2 +- google-cloud-spanner-bom/pom.xml | 18 ++++++++--------- google-cloud-spanner-executor/pom.xml | 4 ++-- google-cloud-spanner/pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- grpc-google-cloud-spanner-executor-v1/pom.xml | 4 ++-- grpc-google-cloud-spanner-v1/pom.xml | 4 ++-- pom.xml | 20 +++++++++---------- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- proto-google-cloud-spanner-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 20 +++++++++---------- 15 files changed, 51 insertions(+), 51 deletions(-) diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml index e82978e3988..b7e47897f00 100644 --- a/benchmarks/pom.xml +++ b/benchmarks/pom.xml @@ -24,7 +24,7 @@ com.google.cloud google-cloud-spanner-parent - 6.98.0 + 6.98.1-SNAPSHOT diff --git a/google-cloud-spanner-bom/pom.xml b/google-cloud-spanner-bom/pom.xml index b962dc8571f..36a8dcdc23d 100644 --- a/google-cloud-spanner-bom/pom.xml +++ b/google-cloud-spanner-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-spanner-bom - 6.98.0 + 6.98.1-SNAPSHOT pom com.google.cloud @@ -53,43 +53,43 @@ com.google.cloud google-cloud-spanner - 6.98.0 + 6.98.1-SNAPSHOT com.google.cloud google-cloud-spanner test-jar - 6.98.0 + 6.98.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-spanner-v1 - 6.98.0 + 6.98.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-spanner-admin-instance-v1 - 6.98.0 + 6.98.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-spanner-admin-database-v1 - 6.98.0 + 6.98.1-SNAPSHOT com.google.api.grpc proto-google-cloud-spanner-admin-instance-v1 - 6.98.0 + 6.98.1-SNAPSHOT com.google.api.grpc proto-google-cloud-spanner-v1 - 6.98.0 + 6.98.1-SNAPSHOT com.google.api.grpc proto-google-cloud-spanner-admin-database-v1 - 6.98.0 + 6.98.1-SNAPSHOT diff --git a/google-cloud-spanner-executor/pom.xml b/google-cloud-spanner-executor/pom.xml index 040c7d3303f..4b373a84a8e 100644 --- a/google-cloud-spanner-executor/pom.xml +++ b/google-cloud-spanner-executor/pom.xml @@ -5,14 +5,14 @@ 4.0.0 com.google.cloud google-cloud-spanner-executor - 6.98.0 + 6.98.1-SNAPSHOT jar Google Cloud Spanner Executor com.google.cloud google-cloud-spanner-parent - 6.98.0 + 6.98.1-SNAPSHOT diff --git a/google-cloud-spanner/pom.xml b/google-cloud-spanner/pom.xml index f571f2fb316..015854f30c3 100644 --- a/google-cloud-spanner/pom.xml +++ b/google-cloud-spanner/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-spanner - 6.98.0 + 6.98.1-SNAPSHOT jar Google Cloud Spanner https://github.com/googleapis/java-spanner @@ -11,7 +11,7 @@ com.google.cloud google-cloud-spanner-parent - 6.98.0 + 6.98.1-SNAPSHOT google-cloud-spanner diff --git a/grpc-google-cloud-spanner-admin-database-v1/pom.xml b/grpc-google-cloud-spanner-admin-database-v1/pom.xml index a5085cfb1af..18a0dfa4ad3 100644 --- a/grpc-google-cloud-spanner-admin-database-v1/pom.xml +++ b/grpc-google-cloud-spanner-admin-database-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-spanner-admin-database-v1 - 6.98.0 + 6.98.1-SNAPSHOT grpc-google-cloud-spanner-admin-database-v1 GRPC library for grpc-google-cloud-spanner-admin-database-v1 com.google.cloud google-cloud-spanner-parent - 6.98.0 + 6.98.1-SNAPSHOT diff --git a/grpc-google-cloud-spanner-admin-instance-v1/pom.xml b/grpc-google-cloud-spanner-admin-instance-v1/pom.xml index 45bd9cff3df..3df77e4d469 100644 --- a/grpc-google-cloud-spanner-admin-instance-v1/pom.xml +++ b/grpc-google-cloud-spanner-admin-instance-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-spanner-admin-instance-v1 - 6.98.0 + 6.98.1-SNAPSHOT grpc-google-cloud-spanner-admin-instance-v1 GRPC library for grpc-google-cloud-spanner-admin-instance-v1 com.google.cloud google-cloud-spanner-parent - 6.98.0 + 6.98.1-SNAPSHOT diff --git a/grpc-google-cloud-spanner-executor-v1/pom.xml b/grpc-google-cloud-spanner-executor-v1/pom.xml index aa72341dac6..e4c44f9e69e 100644 --- a/grpc-google-cloud-spanner-executor-v1/pom.xml +++ b/grpc-google-cloud-spanner-executor-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-spanner-executor-v1 - 6.98.0 + 6.98.1-SNAPSHOT grpc-google-cloud-spanner-executor-v1 GRPC library for google-cloud-spanner com.google.cloud google-cloud-spanner-parent - 6.98.0 + 6.98.1-SNAPSHOT diff --git a/grpc-google-cloud-spanner-v1/pom.xml b/grpc-google-cloud-spanner-v1/pom.xml index 8049deb71bb..5541537ae62 100644 --- a/grpc-google-cloud-spanner-v1/pom.xml +++ b/grpc-google-cloud-spanner-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-spanner-v1 - 6.98.0 + 6.98.1-SNAPSHOT grpc-google-cloud-spanner-v1 GRPC library for grpc-google-cloud-spanner-v1 com.google.cloud google-cloud-spanner-parent - 6.98.0 + 6.98.1-SNAPSHOT diff --git a/pom.xml b/pom.xml index 1e78902769b..6801087c8a5 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-spanner-parent pom - 6.98.0 + 6.98.1-SNAPSHOT Google Cloud Spanner Parent https://github.com/googleapis/java-spanner @@ -61,47 +61,47 @@ com.google.api.grpc proto-google-cloud-spanner-admin-instance-v1 - 6.98.0 + 6.98.1-SNAPSHOT com.google.api.grpc proto-google-cloud-spanner-executor-v1 - 6.98.0 + 6.98.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-spanner-executor-v1 - 6.98.0 + 6.98.1-SNAPSHOT com.google.api.grpc proto-google-cloud-spanner-v1 - 6.98.0 + 6.98.1-SNAPSHOT com.google.api.grpc proto-google-cloud-spanner-admin-database-v1 - 6.98.0 + 6.98.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-spanner-v1 - 6.98.0 + 6.98.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-spanner-admin-instance-v1 - 6.98.0 + 6.98.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-spanner-admin-database-v1 - 6.98.0 + 6.98.1-SNAPSHOT com.google.cloud google-cloud-spanner - 6.98.0 + 6.98.1-SNAPSHOT diff --git a/proto-google-cloud-spanner-admin-database-v1/pom.xml b/proto-google-cloud-spanner-admin-database-v1/pom.xml index 4f4d0e4d2b9..df4aed9f205 100644 --- a/proto-google-cloud-spanner-admin-database-v1/pom.xml +++ b/proto-google-cloud-spanner-admin-database-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-spanner-admin-database-v1 - 6.98.0 + 6.98.1-SNAPSHOT proto-google-cloud-spanner-admin-database-v1 PROTO library for proto-google-cloud-spanner-admin-database-v1 com.google.cloud google-cloud-spanner-parent - 6.98.0 + 6.98.1-SNAPSHOT diff --git a/proto-google-cloud-spanner-admin-instance-v1/pom.xml b/proto-google-cloud-spanner-admin-instance-v1/pom.xml index 2b951cffd01..955b6398d47 100644 --- a/proto-google-cloud-spanner-admin-instance-v1/pom.xml +++ b/proto-google-cloud-spanner-admin-instance-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-spanner-admin-instance-v1 - 6.98.0 + 6.98.1-SNAPSHOT proto-google-cloud-spanner-admin-instance-v1 PROTO library for proto-google-cloud-spanner-admin-instance-v1 com.google.cloud google-cloud-spanner-parent - 6.98.0 + 6.98.1-SNAPSHOT diff --git a/proto-google-cloud-spanner-executor-v1/pom.xml b/proto-google-cloud-spanner-executor-v1/pom.xml index 8d2b710f909..05d9c4fa994 100644 --- a/proto-google-cloud-spanner-executor-v1/pom.xml +++ b/proto-google-cloud-spanner-executor-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-spanner-executor-v1 - 6.98.0 + 6.98.1-SNAPSHOT proto-google-cloud-spanner-executor-v1 Proto library for google-cloud-spanner com.google.cloud google-cloud-spanner-parent - 6.98.0 + 6.98.1-SNAPSHOT diff --git a/proto-google-cloud-spanner-v1/pom.xml b/proto-google-cloud-spanner-v1/pom.xml index 28d5b638974..6da223697fb 100644 --- a/proto-google-cloud-spanner-v1/pom.xml +++ b/proto-google-cloud-spanner-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-spanner-v1 - 6.98.0 + 6.98.1-SNAPSHOT proto-google-cloud-spanner-v1 PROTO library for proto-google-cloud-spanner-v1 com.google.cloud google-cloud-spanner-parent - 6.98.0 + 6.98.1-SNAPSHOT diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 76d32c905cf..2ef305ad26b 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -32,7 +32,7 @@ com.google.cloud google-cloud-spanner - 6.98.0 + 6.98.1-SNAPSHOT diff --git a/versions.txt b/versions.txt index 2fa76186feb..c3d6d96d9b8 100644 --- a/versions.txt +++ b/versions.txt @@ -1,13 +1,13 @@ # Format: # module:released-version:current-version -proto-google-cloud-spanner-admin-instance-v1:6.98.0:6.98.0 -proto-google-cloud-spanner-v1:6.98.0:6.98.0 -proto-google-cloud-spanner-admin-database-v1:6.98.0:6.98.0 -grpc-google-cloud-spanner-v1:6.98.0:6.98.0 -grpc-google-cloud-spanner-admin-instance-v1:6.98.0:6.98.0 -grpc-google-cloud-spanner-admin-database-v1:6.98.0:6.98.0 -google-cloud-spanner:6.98.0:6.98.0 -google-cloud-spanner-executor:6.98.0:6.98.0 -proto-google-cloud-spanner-executor-v1:6.98.0:6.98.0 -grpc-google-cloud-spanner-executor-v1:6.98.0:6.98.0 +proto-google-cloud-spanner-admin-instance-v1:6.98.0:6.98.1-SNAPSHOT +proto-google-cloud-spanner-v1:6.98.0:6.98.1-SNAPSHOT +proto-google-cloud-spanner-admin-database-v1:6.98.0:6.98.1-SNAPSHOT +grpc-google-cloud-spanner-v1:6.98.0:6.98.1-SNAPSHOT +grpc-google-cloud-spanner-admin-instance-v1:6.98.0:6.98.1-SNAPSHOT +grpc-google-cloud-spanner-admin-database-v1:6.98.0:6.98.1-SNAPSHOT +google-cloud-spanner:6.98.0:6.98.1-SNAPSHOT +google-cloud-spanner-executor:6.98.0:6.98.1-SNAPSHOT +proto-google-cloud-spanner-executor-v1:6.98.0:6.98.1-SNAPSHOT +grpc-google-cloud-spanner-executor-v1:6.98.0:6.98.1-SNAPSHOT From 6886eb5e4e0968e3c9c8b3491bbfafa26d423030 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 11 Aug 2025 23:08:47 +0530 Subject: [PATCH 7/7] chore(main): release 6.98.1 (#4018) * chore(main): release 6.98.1 * chore: generate libraries at Mon Aug 11 16:33:14 UTC 2025 --------- Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Co-authored-by: cloud-java-bot --- CHANGELOG.md | 13 ++++++++++++ README.md | 6 +++--- benchmarks/pom.xml | 2 +- google-cloud-spanner-bom/pom.xml | 18 ++++++++--------- google-cloud-spanner-executor/pom.xml | 4 ++-- google-cloud-spanner/pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- grpc-google-cloud-spanner-executor-v1/pom.xml | 4 ++-- grpc-google-cloud-spanner-v1/pom.xml | 4 ++-- pom.xml | 20 +++++++++---------- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- proto-google-cloud-spanner-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 20 +++++++++---------- 17 files changed, 67 insertions(+), 54 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 55ce5999e31..4d510580482 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,18 @@ # Changelog +## [6.98.1](https://github.com/googleapis/java-spanner/compare/v6.98.0...v6.98.1) (2025-08-11) + + +### Bug Fixes + +* Add missing span.end calls for AsyncTransactionManager ([#4012](https://github.com/googleapis/java-spanner/issues/4012)) ([1a4adb4](https://github.com/googleapis/java-spanner/commit/1a4adb4d70c3a3822fa6bda93d689f2dae1835fa)) +* **deps:** Update the Java code generator (gapic-generator-java) to 2.61.0 ([8156ef3](https://github.com/googleapis/java-spanner/commit/8156ef31d93932c14f9fdd13c8c5e5b7ce370ba5)) + + +### Dependencies + +* Update dependency com.google.cloud:sdk-platform-java-config to v3.51.0 ([#4013](https://github.com/googleapis/java-spanner/issues/4013)) ([4e90c29](https://github.com/googleapis/java-spanner/commit/4e90c29ce3447d14411368e45a39c7b0965cb40a)) + ## [6.98.0](https://github.com/googleapis/java-spanner/compare/v6.97.1...v6.98.0) (2025-07-31) diff --git a/README.md b/README.md index 88b491710fc..5d6e065b8d4 100644 --- a/README.md +++ b/README.md @@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-spanner' If you are using Gradle without BOM, add this to your dependencies: ```Groovy -implementation 'com.google.cloud:google-cloud-spanner:6.98.0' +implementation 'com.google.cloud:google-cloud-spanner:6.98.1' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-spanner" % "6.98.0" +libraryDependencies += "com.google.cloud" % "google-cloud-spanner" % "6.98.1" ``` ## Authentication @@ -731,7 +731,7 @@ Java is a registered trademark of Oracle and/or its affiliates. [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-spanner/java11.html [stability-image]: https://img.shields.io/badge/stability-stable-green [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-spanner.svg -[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-spanner/6.98.0 +[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-spanner/6.98.1 [authentication]: https://github.com/googleapis/google-cloud-java#authentication [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml index b7e47897f00..7b992f27820 100644 --- a/benchmarks/pom.xml +++ b/benchmarks/pom.xml @@ -24,7 +24,7 @@ com.google.cloud google-cloud-spanner-parent - 6.98.1-SNAPSHOT + 6.98.1 diff --git a/google-cloud-spanner-bom/pom.xml b/google-cloud-spanner-bom/pom.xml index 36a8dcdc23d..f718ba28ab6 100644 --- a/google-cloud-spanner-bom/pom.xml +++ b/google-cloud-spanner-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-spanner-bom - 6.98.1-SNAPSHOT + 6.98.1 pom com.google.cloud @@ -53,43 +53,43 @@ com.google.cloud google-cloud-spanner - 6.98.1-SNAPSHOT + 6.98.1 com.google.cloud google-cloud-spanner test-jar - 6.98.1-SNAPSHOT + 6.98.1 com.google.api.grpc grpc-google-cloud-spanner-v1 - 6.98.1-SNAPSHOT + 6.98.1 com.google.api.grpc grpc-google-cloud-spanner-admin-instance-v1 - 6.98.1-SNAPSHOT + 6.98.1 com.google.api.grpc grpc-google-cloud-spanner-admin-database-v1 - 6.98.1-SNAPSHOT + 6.98.1 com.google.api.grpc proto-google-cloud-spanner-admin-instance-v1 - 6.98.1-SNAPSHOT + 6.98.1 com.google.api.grpc proto-google-cloud-spanner-v1 - 6.98.1-SNAPSHOT + 6.98.1 com.google.api.grpc proto-google-cloud-spanner-admin-database-v1 - 6.98.1-SNAPSHOT + 6.98.1 diff --git a/google-cloud-spanner-executor/pom.xml b/google-cloud-spanner-executor/pom.xml index 4b373a84a8e..2bb7b54373e 100644 --- a/google-cloud-spanner-executor/pom.xml +++ b/google-cloud-spanner-executor/pom.xml @@ -5,14 +5,14 @@ 4.0.0 com.google.cloud google-cloud-spanner-executor - 6.98.1-SNAPSHOT + 6.98.1 jar Google Cloud Spanner Executor com.google.cloud google-cloud-spanner-parent - 6.98.1-SNAPSHOT + 6.98.1 diff --git a/google-cloud-spanner/pom.xml b/google-cloud-spanner/pom.xml index 015854f30c3..5749973156e 100644 --- a/google-cloud-spanner/pom.xml +++ b/google-cloud-spanner/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-spanner - 6.98.1-SNAPSHOT + 6.98.1 jar Google Cloud Spanner https://github.com/googleapis/java-spanner @@ -11,7 +11,7 @@ com.google.cloud google-cloud-spanner-parent - 6.98.1-SNAPSHOT + 6.98.1 google-cloud-spanner diff --git a/grpc-google-cloud-spanner-admin-database-v1/pom.xml b/grpc-google-cloud-spanner-admin-database-v1/pom.xml index 18a0dfa4ad3..bf295888dab 100644 --- a/grpc-google-cloud-spanner-admin-database-v1/pom.xml +++ b/grpc-google-cloud-spanner-admin-database-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-spanner-admin-database-v1 - 6.98.1-SNAPSHOT + 6.98.1 grpc-google-cloud-spanner-admin-database-v1 GRPC library for grpc-google-cloud-spanner-admin-database-v1 com.google.cloud google-cloud-spanner-parent - 6.98.1-SNAPSHOT + 6.98.1 diff --git a/grpc-google-cloud-spanner-admin-instance-v1/pom.xml b/grpc-google-cloud-spanner-admin-instance-v1/pom.xml index 3df77e4d469..660eaeaf301 100644 --- a/grpc-google-cloud-spanner-admin-instance-v1/pom.xml +++ b/grpc-google-cloud-spanner-admin-instance-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-spanner-admin-instance-v1 - 6.98.1-SNAPSHOT + 6.98.1 grpc-google-cloud-spanner-admin-instance-v1 GRPC library for grpc-google-cloud-spanner-admin-instance-v1 com.google.cloud google-cloud-spanner-parent - 6.98.1-SNAPSHOT + 6.98.1 diff --git a/grpc-google-cloud-spanner-executor-v1/pom.xml b/grpc-google-cloud-spanner-executor-v1/pom.xml index e4c44f9e69e..886231b8fbe 100644 --- a/grpc-google-cloud-spanner-executor-v1/pom.xml +++ b/grpc-google-cloud-spanner-executor-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-spanner-executor-v1 - 6.98.1-SNAPSHOT + 6.98.1 grpc-google-cloud-spanner-executor-v1 GRPC library for google-cloud-spanner com.google.cloud google-cloud-spanner-parent - 6.98.1-SNAPSHOT + 6.98.1 diff --git a/grpc-google-cloud-spanner-v1/pom.xml b/grpc-google-cloud-spanner-v1/pom.xml index 5541537ae62..4fdb064d8a8 100644 --- a/grpc-google-cloud-spanner-v1/pom.xml +++ b/grpc-google-cloud-spanner-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-spanner-v1 - 6.98.1-SNAPSHOT + 6.98.1 grpc-google-cloud-spanner-v1 GRPC library for grpc-google-cloud-spanner-v1 com.google.cloud google-cloud-spanner-parent - 6.98.1-SNAPSHOT + 6.98.1 diff --git a/pom.xml b/pom.xml index 6801087c8a5..40d14ed25cb 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-spanner-parent pom - 6.98.1-SNAPSHOT + 6.98.1 Google Cloud Spanner Parent https://github.com/googleapis/java-spanner @@ -61,47 +61,47 @@ com.google.api.grpc proto-google-cloud-spanner-admin-instance-v1 - 6.98.1-SNAPSHOT + 6.98.1 com.google.api.grpc proto-google-cloud-spanner-executor-v1 - 6.98.1-SNAPSHOT + 6.98.1 com.google.api.grpc grpc-google-cloud-spanner-executor-v1 - 6.98.1-SNAPSHOT + 6.98.1 com.google.api.grpc proto-google-cloud-spanner-v1 - 6.98.1-SNAPSHOT + 6.98.1 com.google.api.grpc proto-google-cloud-spanner-admin-database-v1 - 6.98.1-SNAPSHOT + 6.98.1 com.google.api.grpc grpc-google-cloud-spanner-v1 - 6.98.1-SNAPSHOT + 6.98.1 com.google.api.grpc grpc-google-cloud-spanner-admin-instance-v1 - 6.98.1-SNAPSHOT + 6.98.1 com.google.api.grpc grpc-google-cloud-spanner-admin-database-v1 - 6.98.1-SNAPSHOT + 6.98.1 com.google.cloud google-cloud-spanner - 6.98.1-SNAPSHOT + 6.98.1 diff --git a/proto-google-cloud-spanner-admin-database-v1/pom.xml b/proto-google-cloud-spanner-admin-database-v1/pom.xml index df4aed9f205..4466364f028 100644 --- a/proto-google-cloud-spanner-admin-database-v1/pom.xml +++ b/proto-google-cloud-spanner-admin-database-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-spanner-admin-database-v1 - 6.98.1-SNAPSHOT + 6.98.1 proto-google-cloud-spanner-admin-database-v1 PROTO library for proto-google-cloud-spanner-admin-database-v1 com.google.cloud google-cloud-spanner-parent - 6.98.1-SNAPSHOT + 6.98.1 diff --git a/proto-google-cloud-spanner-admin-instance-v1/pom.xml b/proto-google-cloud-spanner-admin-instance-v1/pom.xml index 955b6398d47..93aaed6cc1b 100644 --- a/proto-google-cloud-spanner-admin-instance-v1/pom.xml +++ b/proto-google-cloud-spanner-admin-instance-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-spanner-admin-instance-v1 - 6.98.1-SNAPSHOT + 6.98.1 proto-google-cloud-spanner-admin-instance-v1 PROTO library for proto-google-cloud-spanner-admin-instance-v1 com.google.cloud google-cloud-spanner-parent - 6.98.1-SNAPSHOT + 6.98.1 diff --git a/proto-google-cloud-spanner-executor-v1/pom.xml b/proto-google-cloud-spanner-executor-v1/pom.xml index 05d9c4fa994..310550bf297 100644 --- a/proto-google-cloud-spanner-executor-v1/pom.xml +++ b/proto-google-cloud-spanner-executor-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-spanner-executor-v1 - 6.98.1-SNAPSHOT + 6.98.1 proto-google-cloud-spanner-executor-v1 Proto library for google-cloud-spanner com.google.cloud google-cloud-spanner-parent - 6.98.1-SNAPSHOT + 6.98.1 diff --git a/proto-google-cloud-spanner-v1/pom.xml b/proto-google-cloud-spanner-v1/pom.xml index 6da223697fb..20f0829d385 100644 --- a/proto-google-cloud-spanner-v1/pom.xml +++ b/proto-google-cloud-spanner-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-spanner-v1 - 6.98.1-SNAPSHOT + 6.98.1 proto-google-cloud-spanner-v1 PROTO library for proto-google-cloud-spanner-v1 com.google.cloud google-cloud-spanner-parent - 6.98.1-SNAPSHOT + 6.98.1 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 2ef305ad26b..89f1ccced22 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -32,7 +32,7 @@ com.google.cloud google-cloud-spanner - 6.98.1-SNAPSHOT + 6.98.1 diff --git a/versions.txt b/versions.txt index c3d6d96d9b8..41d2b62adec 100644 --- a/versions.txt +++ b/versions.txt @@ -1,13 +1,13 @@ # Format: # module:released-version:current-version -proto-google-cloud-spanner-admin-instance-v1:6.98.0:6.98.1-SNAPSHOT -proto-google-cloud-spanner-v1:6.98.0:6.98.1-SNAPSHOT -proto-google-cloud-spanner-admin-database-v1:6.98.0:6.98.1-SNAPSHOT -grpc-google-cloud-spanner-v1:6.98.0:6.98.1-SNAPSHOT -grpc-google-cloud-spanner-admin-instance-v1:6.98.0:6.98.1-SNAPSHOT -grpc-google-cloud-spanner-admin-database-v1:6.98.0:6.98.1-SNAPSHOT -google-cloud-spanner:6.98.0:6.98.1-SNAPSHOT -google-cloud-spanner-executor:6.98.0:6.98.1-SNAPSHOT -proto-google-cloud-spanner-executor-v1:6.98.0:6.98.1-SNAPSHOT -grpc-google-cloud-spanner-executor-v1:6.98.0:6.98.1-SNAPSHOT +proto-google-cloud-spanner-admin-instance-v1:6.98.1:6.98.1 +proto-google-cloud-spanner-v1:6.98.1:6.98.1 +proto-google-cloud-spanner-admin-database-v1:6.98.1:6.98.1 +grpc-google-cloud-spanner-v1:6.98.1:6.98.1 +grpc-google-cloud-spanner-admin-instance-v1:6.98.1:6.98.1 +grpc-google-cloud-spanner-admin-database-v1:6.98.1:6.98.1 +google-cloud-spanner:6.98.1:6.98.1 +google-cloud-spanner-executor:6.98.1:6.98.1 +proto-google-cloud-spanner-executor-v1:6.98.1:6.98.1 +grpc-google-cloud-spanner-executor-v1:6.98.1:6.98.1