Merge branch 'main' into gfe_latency

surbhigarg92 · surbhigarg92 · commit 592a4b116d3f · 2025-01-29T15:38:32.000+05:30
diff --git 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.51.1
+    - uses: googleapis/sdk-platform-java/.github/scripts@v2.52.0
       if: env.SHOULD_RUN == 'true'
       with:
         base_ref: ${{ github.base_ref }}
diff --git 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.52.0')
+implementation platform('com.google.cloud:libraries-bom:26.53.0')
 
 implementation 'com.google.cloud:google-cloud-spanner'
 ```
diff --git a/generation_config.yaml b/generation_config.yaml
@@ -1,6 +1,6 @@
-gapic_generator_version: 2.51.1
-googleapis_commitish: d581bbe1a66ad2e47eda2beebf6200f23b766ca9
-libraries_bom_version: 26.52.0
+gapic_generator_version: 2.52.0
+googleapis_commitish: 280725e991516d4a0f136268faf5aa6d32d21b54
+libraries_bom_version: 26.53.0
 libraries:
   - api_shortname: spanner
     name_pretty: Cloud Spanner
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/AbstractResultSet.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/AbstractResultSet.java
@@ -48,7 +48,8 @@ abstract class AbstractResultSet<R> extends AbstractStructReader implements Resu
   interface Listener {
     /**
      * Called when transaction metadata is seen. This method may be invoked at most once. If the
-     * method is invoked, it will precede {@link #onError(SpannerException)} or {@link #onDone()}.
+     * method is invoked, it will precede {@link #onError(SpannerException,boolean)} or {@link
+     * #onDone(boolean)}.
      */
     void onTransactionMetadata(Transaction transaction, boolean shouldIncludeId)
         throws SpannerException;
@@ -160,7 +161,7 @@ default boolean initiateStreaming(AsyncResultSet.StreamMessageListener streamMes
     }
 
     /** it requests the initial prefetch chunks from gRPC stream */
-    default void requestPrefetchChunks() {};
+    default void requestPrefetchChunks() {}
   }
 
   static double valueProtoToFloat64(com.google.protobuf.Value proto) {
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/GceTestEnvConfig.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/GceTestEnvConfig.java
@@ -59,7 +59,6 @@ public class GceTestEnvConfig implements TestEnvConfig {
 
   public GceTestEnvConfig() {
     String projectId = System.getProperty(GCE_PROJECT_ID, "");
-    projectId = "span-cloud-testing";
     String serverUrl = System.getProperty(GCE_SERVER_URL, "");
     String credentialsFile = System.getProperty(GCE_CREDENTIALS_FILE, "");
     double errorProbability =
@@ -84,22 +83,22 @@ public GceTestEnvConfig() {
         throw new RuntimeException(e);
       }
     }
-    // SpannerInterceptorProvider interceptorProvider =
-    //     SpannerInterceptorProvider.createDefault().with(new GrpcErrorInjector(errorProbability));
-    //  if (attemptDirectPath) {
-    //   interceptorProvider =
-    //       interceptorProvider.with(new DirectPathAddressCheckInterceptor(directPathTestScenario));
-    // }
-    // builder.setInterceptorProvider(interceptorProvider);
+    SpannerInterceptorProvider interceptorProvider =
+        SpannerInterceptorProvider.createDefault().with(new GrpcErrorInjector(errorProbability));
+    if (attemptDirectPath) {
+      interceptorProvider =
+          interceptorProvider.with(new DirectPathAddressCheckInterceptor(directPathTestScenario));
+    }
+    builder.setInterceptorProvider(interceptorProvider);
     // DirectPath tests need to set a custom endpoint to the ChannelProvider
     InstantiatingGrpcChannelProvider.Builder customChannelProviderBuilder =
         InstantiatingGrpcChannelProvider.newBuilder();
     if (attemptDirectPath) {
       customChannelProviderBuilder
           .setEndpoint(DIRECT_PATH_ENDPOINT)
           .setAttemptDirectPath(true)
-          .setAttemptDirectPathXds();
-          // .setInterceptorProvider(interceptorProvider);
+          .setAttemptDirectPathXds()
+          .setInterceptorProvider(interceptorProvider);
       builder.setChannelProvider(customChannelProviderBuilder.build());
     }
     options = builder.build();
diff --git a/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/CrontabSpec.java b/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/CrontabSpec.java
@@ -76,7 +76,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    * <pre>
    * Required. Textual representation of the crontab. User can customize the
    * backup frequency and the backup version time using the cron
-   * expression. The version time must be in UTC timzeone.
+   * expression. The version time must be in UTC timezone.
    *
    * The backup will contain an externally consistent copy of the
    * database at the version time. Allowed frequencies are 12 hour, 1 day,
@@ -110,7 +110,7 @@ public java.lang.String getText() {
    * <pre>
    * Required. Textual representation of the crontab. User can customize the
    * backup frequency and the backup version time using the cron
-   * expression. The version time must be in UTC timzeone.
+   * expression. The version time must be in UTC timezone.
    *
    * The backup will contain an externally consistent copy of the
    * database at the version time. Allowed frequencies are 12 hour, 1 day,
@@ -684,7 +684,7 @@ public Builder mergeFrom(
      * <pre>
      * Required. Textual representation of the crontab. User can customize the
      * backup frequency and the backup version time using the cron
-     * expression. The version time must be in UTC timzeone.
+     * expression. The version time must be in UTC timezone.
      *
      * The backup will contain an externally consistent copy of the
      * database at the version time. Allowed frequencies are 12 hour, 1 day,
@@ -717,7 +717,7 @@ public java.lang.String getText() {
      * <pre>
      * Required. Textual representation of the crontab. User can customize the
      * backup frequency and the backup version time using the cron
-     * expression. The version time must be in UTC timzeone.
+     * expression. The version time must be in UTC timezone.
      *
      * The backup will contain an externally consistent copy of the
      * database at the version time. Allowed frequencies are 12 hour, 1 day,
@@ -750,7 +750,7 @@ public com.google.protobuf.ByteString getTextBytes() {
      * <pre>
      * Required. Textual representation of the crontab. User can customize the
      * backup frequency and the backup version time using the cron
-     * expression. The version time must be in UTC timzeone.
+     * expression. The version time must be in UTC timezone.
      *
      * The backup will contain an externally consistent copy of the
      * database at the version time. Allowed frequencies are 12 hour, 1 day,
@@ -782,7 +782,7 @@ public Builder setText(java.lang.String value) {
      * <pre>
      * Required. Textual representation of the crontab. User can customize the
      * backup frequency and the backup version time using the cron
-     * expression. The version time must be in UTC timzeone.
+     * expression. The version time must be in UTC timezone.
      *
      * The backup will contain an externally consistent copy of the
      * database at the version time. Allowed frequencies are 12 hour, 1 day,
@@ -810,7 +810,7 @@ public Builder clearText() {
      * <pre>
      * Required. Textual representation of the crontab. User can customize the
      * backup frequency and the backup version time using the cron
-     * expression. The version time must be in UTC timzeone.
+     * expression. The version time must be in UTC timezone.
      *
      * The backup will contain an externally consistent copy of the
      * database at the version time. Allowed frequencies are 12 hour, 1 day,
diff --git a/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/CrontabSpecOrBuilder.java b/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/CrontabSpecOrBuilder.java
@@ -30,7 +30,7 @@ public interface CrontabSpecOrBuilder
    * <pre>
    * Required. Textual representation of the crontab. User can customize the
    * backup frequency and the backup version time using the cron
-   * expression. The version time must be in UTC timzeone.
+   * expression. The version time must be in UTC timezone.
    *
    * The backup will contain an externally consistent copy of the
    * database at the version time. Allowed frequencies are 12 hour, 1 day,
@@ -53,7 +53,7 @@ public interface CrontabSpecOrBuilder
    * <pre>
    * Required. Textual representation of the crontab. User can customize the
    * backup frequency and the backup version time using the cron
-   * expression. The version time must be in UTC timzeone.
+   * expression. The version time must be in UTC timezone.
    *
    * The backup will contain an externally consistent copy of the
    * database at the version time. Allowed frequencies are 12 hour, 1 day,
diff --git a/proto-google-cloud-spanner-admin-database-v1/src/main/proto/google/spanner/admin/database/v1/backup_schedule.proto b/proto-google-cloud-spanner-admin-database-v1/src/main/proto/google/spanner/admin/database/v1/backup_schedule.proto
@@ -100,7 +100,7 @@ message BackupSchedule {
 message CrontabSpec {
   // Required. Textual representation of the crontab. User can customize the
   // backup frequency and the backup version time using the cron
-  // expression. The version time must be in UTC timzeone.
+  // expression. The version time must be in UTC timezone.
   //
   // The backup will contain an externally consistent copy of the
   // database at the version time. Allowed frequencies are 12 hour, 1 day,
