chore: Update generation configuration at Sat Apr 26 02:28:07 UTC 2025

.github/generated-files-bot.yml

@@ -6,6 +6,7 @@ externalManifests:
   file: '.github/readme/synth.metadata/synth.metadata'
   jsonpath: '$.generatedFiles[*]'
 ignoreAuthors:
+- 'cloud-java-bot'
 - 'renovate-bot'
 - 'yoshi-automation'
 - 'release-please[bot]'

.github/scripts/update_generation_config.sh

@@ -15,8 +15,15 @@ set -e
 function get_latest_released_version() {
     local group_id=$1
     local artifact_id=$2
-    latest=$(curl -s "https://search.maven.org/solrsearch/select?q=g:${group_id}+AND+a:${artifact_id}&core=gav&rows=500&wt=json" | jq -r '.response.docs[] | select(.v | test("^[0-9]+(\\.[0-9]+)*$")) | .v' | sort -V | tail -n 1)
-    echo "${latest}"
+    json_content=$(curl -s "https://search.maven.org/solrsearch/select?q=g:${group_id}+AND+a:${artifact_id}&core=gav&rows=500&wt=json")
+    latest=$(jq -r '.response.docs[] | select(.v | test("^[0-9]+(\\.[0-9]+)*$")) | .v' <<< "${json_content}" | sort -V | tail -n 1)
+    if [[ -z "${latest}" ]]; then
+        echo "The latest version of ${group_id}:${artifact_id} is empty."
+        echo "The returned json from maven.org is invalid: ${json_content}"
+        exit 1
+    else
+        echo "${latest}"
+    fi
 }
 
 # Update a key to a new value in the generation config.

.github/trusted-contribution.yml

@@ -1,3 +1,9 @@
 trustedContributors:
 - renovate-bot
 - gcf-owl-bot[bot]
+
+annotations:
+- type: comment
+  text: "/gcbrun"
+- type: label
+  text: "kokoro:force-run"

.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.55.1
+    - uses: googleapis/sdk-platform-java/.github/scripts@v2.56.2
       if: env.SHOULD_RUN == 'true'
       with:
         base_ref: ${{ github.base_ref }}

.github/workflows/renovate_config_check.yaml

@@ -7,19 +7,19 @@
 
 jobs:
   renovate_bot_config_validation:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
     - name: Checkout code
       uses: actions/checkout@v4
 
     - name: Set up Node.js
       uses: actions/setup-node@v4
       with:
-        node-version: '20'
+        node-version: '22'
 
     - name: Install Renovate and Config Validator
       run: |
         npm install -g npm@latest
         npm install --global renovate
         renovate-config-validator

.github/workflows/update_generation_config.yaml

@@ -28,6 +28,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
       with:
+        fetch-depth: 0
         token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
     - name: Update params in generation config to latest
       shell: bash
@@ -36,7 +37,8 @@ jobs:
         [ -z "$(git config user.email)" ] && git config --global user.email "[email protected]"
         [ -z "$(git config user.name)" ] && git config --global user.name "cloud-java-bot"
         bash .github/scripts/update_generation_config.sh \
-          --base_branch "${base_branch}"\
+          --base_branch "${base_branch}" \
           --repo ${{ github.repository }}
       env:
         GH_TOKEN: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
+

.kokoro/build.sh

@@ -82,7 +82,7 @@ test)
     RETURN_CODE=$?
     ;;
 lint)
-    mvn com.coveo:fmt-maven-plugin:check
+    mvn com.spotify.fmt:fmt-maven-plugin:check
     RETURN_CODE=$?
     ;;
 javadoc)

.kokoro/presubmit/graalvm-native.cfg → .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.45.1"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.46.2" # {x-version-update:google-cloud-shared-dependencies:current}
 }
 
 env_vars: {
@@ -31,3 +31,8 @@ env_vars: {
   key: "SECRET_MANAGER_KEYS"
   value: "java-it-service-account"
 }
+
+env_vars: {
+  key: "IT_SERVICE_ACCOUNT_EMAIL"
+  value: "[email protected]"
+}

.kokoro/presubmit/graalvm-native-17.cfg → .kokoro/presubmit/graalvm-native-b.cfg

@@ -3,12 +3,12 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.45.1"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.46.2" # {x-version-update:google-cloud-shared-dependencies:current}
 }
 
 env_vars: {
   key: "JOB_TYPE"
-  value: "graalvm17"
+  value: "graalvm"
 }
 
 # TODO: remove this after we've migrated all tests and scripts
@@ -30,4 +30,9 @@ env_vars: {
 env_vars: {
   key: "SECRET_MANAGER_KEYS"
   value: "java-it-service-account"
+}
+
+env_vars: {
+  key: "IT_SERVICE_ACCOUNT_EMAIL"
+  value: "[email protected]"
 }

.kokoro/presubmit/graalvm-native-c.cfg

@@ -0,0 +1,38 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.46.2" # {x-version-update:google-cloud-shared-dependencies:current}
+}
+
+env_vars: {
+  key: "JOB_TYPE"
+  value: "graalvm"
+}
+
+# TODO: remove this after we've migrated all tests and scripts
+env_vars: {
+  key: "GCLOUD_PROJECT"
+  value: "gcloud-devel"
+}
+
+env_vars: {
+  key: "GOOGLE_CLOUD_PROJECT"
+  value: "gcloud-devel"
+}
+
+env_vars: {
+  key: "GOOGLE_APPLICATION_CREDENTIALS"
+  value: "secret_manager/java-it-service-account"
+}
+
+env_vars: {
+  key: "SECRET_MANAGER_KEYS"
+  value: "java-it-service-account"
+}
+
+env_vars: {
+  key: "IT_SERVICE_ACCOUNT_EMAIL"
+  value: "[email protected]"
+}

CONTRIBUTING.md

@@ -84,7 +84,7 @@ Code in this repo is formatted with
 [google-java-format](https://github.com/google/google-java-format).
 To run formatting on your project, you can run:
 ```
-mvn com.coveo:fmt-maven-plugin:format
+mvn com.spotify.fmt:fmt-maven-plugin:format
 ```
 
 [1]: https://cloud.google.com/docs/authentication/getting-started#creating_a_service_account

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.57.0')
+implementation platform('com.google.cloud:libraries-bom:26.59.0')
 
 implementation 'com.google.cloud:google-cloud-spanner'
 ```

benchmarks/src/main/java/com/google/cloud/spanner/benchmark/LatencyBenchmark.java

@@ -48,7 +48,11 @@ public static void main(String[] args) throws ParseException {
           String.format("projects/%s/instances/%s/databases/%s", project, instance, database);
     } else {
       throw new IllegalArgumentException(
-          "You must either set all the environment variables SPANNER_CLIENT_BENCHMARK_GOOGLE_CLOUD_PROJECT, SPANNER_CLIENT_BENCHMARK_SPANNER_INSTANCE and SPANNER_CLIENT_BENCHMARK_SPANNER_DATABASE, or specify a value for the command line argument --database");
+          "You must either set all the environment variables"
+              + " SPANNER_CLIENT_BENCHMARK_GOOGLE_CLOUD_PROJECT,"
+              + " SPANNER_CLIENT_BENCHMARK_SPANNER_INSTANCE and"
+              + " SPANNER_CLIENT_BENCHMARK_SPANNER_DATABASE, or specify a value for the command"
+              + " line argument --database");
     }
 
     LatencyBenchmark benchmark = new LatencyBenchmark(DatabaseId.of(fullyQualifiedDatabase));
@@ -69,13 +73,15 @@ private static CommandLine parseCommandLine(String[] args) throws ParseException
         "w",
         "wait",
         true,
-        "The wait time in milliseconds between each query that is executed by each client. Defaults to 0. "
-            + "Set this to for example 1000 to have each client execute 1 query per second.");
+        "The wait time in milliseconds between each query that is executed by each client. Defaults"
+            + " to 0. Set this to for example 1000 to have each client execute 1 query per"
+            + " second.");
     options.addOption(
         "t",
         "transaction",
         true,
-        "The type of transaction to execute. Must be either READ_ONLY or READ_WRITE. Defaults to READ_ONLY.");
+        "The type of transaction to execute. Must be either READ_ONLY or READ_WRITE. Defaults to"
+            + " READ_ONLY.");
     options.addOption("m", "multiplexed", true, "Use multiplexed sessions. Defaults to false.");
     options.addOption("w", "wait", true, "Wait time in millis. Defaults to zero.");
     options.addOption("name", true, "Name of this test run");

generation_config.yaml

@@ -1,6 +1,6 @@
-gapic_generator_version: 2.55.1
-googleapis_commitish: 0c142cc0ed988797104f3c934b0d5cfe0906b948
-libraries_bom_version: 26.57.0
+gapic_generator_version: 2.56.2
+googleapis_commitish: 7b29e663fbd7b0e203d4ed4b843cff20a8c386a6
+libraries_bom_version: 26.59.0
 libraries:
   - api_shortname: spanner
     name_pretty: Cloud Spanner

google-cloud-spanner-executor/src/main/java/com/google/cloud/executor/spanner/CloudClientExecutor.java

@@ -424,6 +424,7 @@ public synchronized boolean finish(Mode finishMode) throws Exception {
       }
     }
   }
+
   /**
    * All the context in which SpannerActions are executed. It stores the current running transaction
    * and table metadata, shared by all the action executor and protected by a lock. There will only
@@ -790,7 +791,7 @@ private synchronized Spanner getClient(boolean useMultiplexedSession) throws IOE
     if (client != null) {
       return client;
     }
-    client = getClient(/*timeoutSeconds=*/ 0, useMultiplexedSession);
+    client = getClient(/* timeoutSeconds= */ 0, useMultiplexedSession);
     return client;
   }
 
@@ -1021,7 +1022,7 @@ private Status executeAction(
         return executeFinishTxn(action.getFinish(), outcomeSender, executionContext);
       } else if (action.hasMutation()) {
         return executeMutation(
-            action.getMutation(), outcomeSender, executionContext, /*isWrite=*/ false);
+            action.getMutation(), outcomeSender, executionContext, /* isWrite= */ false);
       } else if (action.hasRead()) {
         return executeRead(
             useMultiplexedSession, action.getRead(), outcomeSender, executionContext);
@@ -1035,7 +1036,7 @@ private Status executeAction(
         return executeCloudBatchDmlUpdates(action.getBatchDml(), outcomeSender, executionContext);
       } else if (action.hasWrite()) {
         return executeMutation(
-            action.getWrite().getMutation(), outcomeSender, executionContext, /*isWrite=*/ true);
+            action.getWrite().getMutation(), outcomeSender, executionContext, /* isWrite= */ true);
       } else if (action.hasStartBatchTxn()) {
         if (dbPath == null) {
           throw SpannerExceptionFactory.newSpannerException(
@@ -3197,7 +3198,7 @@ private static com.google.cloud.spanner.KeyRange keyRangeProtoToCloudKeyRange(
         return KeyRange.openClosed(start, end);
       case OPEN_OPEN:
         return KeyRange.openOpen(start, end);
-        // Unreachable.
+      // Unreachable.
       default:
         throw SpannerExceptionFactory.newSpannerException(
             ErrorCode.INVALID_ARGUMENT, "Unrecognized key range type");
@@ -3250,7 +3251,7 @@ private static com.google.cloud.spanner.Key keyProtoToCloudKey(
           case BYTES:
             cloudKey.append(toByteArray(part.getBytesValue()));
             break;
-            // Unreachable
+          // Unreachable
           default:
             throw SpannerExceptionFactory.newSpannerException(
                 ErrorCode.INVALID_ARGUMENT, "Unsupported key part type: " + type.getCode().name());

google-cloud-spanner-executor/src/main/java/com/google/cloud/executor/spanner/CloudExecutor.java

@@ -368,9 +368,9 @@ private Status flush() {
         LOGGER.log(
             Level.INFO,
             String.format(
-                "OutcomeSender with action ID %s for change stream %s and partition token %s is "
-                    + "sending data change records with the following transaction id/record sequence "
-                    + "combinations: %s and partition tokens: %s",
+                "OutcomeSender with action ID %s for change stream %s and partition token %s is"
+                    + " sending data change records with the following transaction id/record"
+                    + " sequence combinations: %s and partition tokens: %s",
                 this.changeStreamForQuery,
                 this.partitionTokenForQuery,
                 actionId,

google-cloud-spanner-executor/src/main/java/com/google/cloud/executor/spanner/CloudExecutorImpl.java

@@ -91,21 +91,14 @@ public void onNext(SpannerAsyncActionRequest request) {
           SessionPoolOptions.Builder sessionPoolOptionsBuilder;
           if (request.getAction().getSpannerOptions().hasSessionPoolOptions()) {
             sessionPoolOptionsBuilder =
-                request
-                    .getAction()
-                    .getSpannerOptions()
-                    .getSessionPoolOptions()
-                    .toBuilder()
+                request.getAction().getSpannerOptions().getSessionPoolOptions().toBuilder()
                     .setUseMultiplexed(true);
           } else {
             sessionPoolOptionsBuilder = SessionPoolOptions.newBuilder().setUseMultiplexed(true);
           }
 
           SpannerOptions.Builder optionsBuilder =
-              request
-                  .getAction()
-                  .getSpannerOptions()
-                  .toBuilder()
+              request.getAction().getSpannerOptions().toBuilder()
                   .setSessionPoolOptions(sessionPoolOptionsBuilder);
           SpannerAction.Builder actionBuilder =
               request.getAction().toBuilder().setSpannerOptions(optionsBuilder);

google-cloud-spanner-executor/src/test/java/com/google/cloud/spanner/executor/v1/MockSpannerExecutorProxyImpl.java

@@ -77,7 +77,8 @@ public void onNext(SpannerAsyncActionRequest value) {
               responseObserver.onError(
                   new IllegalArgumentException(
                       String.format(
-                          "Unrecognized response type %s for method ExecuteActionAsync, expected %s or %s",
+                          "Unrecognized response type %s for method ExecuteActionAsync, expected %s"
+                              + " or %s",
                           response == null ? "null" : response.getClass().getName(),
                           SpannerAsyncActionResponse.class.getName(),
                           Exception.class.getName())));

google-cloud-spanner/src/main/java/com/google/cloud/spanner/AbstractReadContext.java

@@ -793,7 +793,7 @@ ResultSet executeQueryInternalWithOptions(
         options.hasPrefetchChunks() ? options.prefetchChunks() : defaultPrefetchChunks;
     final ExecuteSqlRequest.Builder request =
         getExecuteSqlRequestBuilder(
-            statement, queryMode, options, /* withTransactionSelector = */ false);
+            statement, queryMode, options, /* withTransactionSelector= */ false);
     ResumableStreamIterator stream =
         new ResumableStreamIterator(
             MAX_BUFFERED_CHUNKS,
@@ -1036,7 +1036,7 @@ CloseableIterator<PartialResultSet> startStream(
                     getTransactionChannelHint(),
                     isRouteToLeader());
             session.markUsed(clock.instant());
-            stream.setCall(call, /* withBeginTransaction = */ builder.getTransaction().hasBegin());
+            stream.setCall(call, /* withBeginTransaction= */ builder.getTransaction().hasBegin());
             return stream;
           }
 

google-cloud-spanner/src/main/java/com/google/cloud/spanner/AsyncResultSetImpl.java

@@ -91,6 +91,7 @@ private enum State {
 
   private final BlockingDeque<Struct> buffer;
   private Struct currentRow;
+
   /** Supplies the underlying synchronous {@link ResultSet} that will be producing the rows. */
   private final Supplier<ResultSet> delegateResultSet;
 
@@ -137,11 +138,13 @@ private enum State {
    * production of rows that are put into the buffer is only paused once the buffer is full.
    */
   private volatile CountDownLatch pausedLatch = new CountDownLatch(1);
+
   /**
    * This variable is used to pause the producer when the buffer is full and the consumer needs some
    * time to catch up.
    */
   private volatile CountDownLatch bufferConsumptionLatch = new CountDownLatch(0);
+
   /**
    * This variable is used to pause the producer when all rows have been put into the buffer, but
    * the consumer (the callback) has not yet received and processed all rows.

google-cloud-spanner/src/main/java/com/google/cloud/spanner/AsyncTransactionManagerImpl.java

@@ -93,7 +93,7 @@ private ApiFuture<TransactionContext> internalBeginAsync(boolean firstAttempt) {
 
     txn =
         session.newTransaction(
-            options, /* previousTransactionId = */ multiplexedSessionPreviousTransactionId);
+            options, /* previousTransactionId= */ multiplexedSessionPreviousTransactionId);
     if (firstAttempt) {
       session.setActive(this);
     }

google-cloud-spanner/src/main/java/com/google/cloud/spanner/BatchClient.java

@@ -67,5 +67,6 @@ public interface BatchClient {
    */
   default String getDatabaseRole() {
     throw new UnsupportedOperationException("method should be overwritten");
-  };
+  }
+  ;
 }