Merge branch 'main' into release-please--branches--main

rahul2393 · web-flow · commit 26ae8040624d · 2026-03-25T11:55:12.000+05:30
diff --git 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.57.0" # {x-version-update:google-cloud-shared-dependencies:current}
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.58.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
@@ -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.57.0" # {x-version-update:google-cloud-shared-dependencies:current}
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.58.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
@@ -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.57.0" # {x-version-update:google-cloud-shared-dependencies:current}
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.58.0" # {x-version-update:google-cloud-shared-dependencies:current}
 }
 
 env_vars: {
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.76.0')
+implementation platform('com.google.cloud:libraries-bom:26.78.0')
 
 implementation 'com.google.cloud:google-cloud-spanner'
 ```
diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml
@@ -91,7 +91,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-spanner</artifactId>
-      <version>6.110.0</version>
+      <version>6.112.0</version>
     </dependency>
     <dependency>
       <groupId>com.google.auto.value</groupId>
diff --git a/generation_config.yaml b/generation_config.yaml
@@ -1,6 +1,6 @@
-gapic_generator_version: 2.67.0
-googleapis_commitish: 5c9602dbb5ac6856c07daf83be1fbd001a972ef3
-libraries_bom_version: 26.76.0
+gapic_generator_version: 2.68.0
+googleapis_commitish: 59d5f2b46924714af627ac29ea6de78641a00835
+libraries_bom_version: 26.78.0
 libraries:
   - api_shortname: spanner
     name_pretty: Cloud Spanner
diff --git a/google-cloud-spanner-executor/src/main/java/com/google/cloud/spanner/executor/v1/stub/SpannerExecutorProxyStubSettings.java b/google-cloud-spanner-executor/src/main/java/com/google/cloud/spanner/executor/v1/stub/SpannerExecutorProxyStubSettings.java
@@ -27,6 +27,7 @@
 import com.google.api.gax.retrying.RetrySettings;
 import com.google.api.gax.rpc.ApiClientHeaderProvider;
 import com.google.api.gax.rpc.ClientContext;
+import com.google.api.gax.rpc.LibraryMetadata;
 import com.google.api.gax.rpc.StatusCode;
 import com.google.api.gax.rpc.StreamingCallSettings;
 import com.google.api.gax.rpc.StubSettings;
@@ -95,6 +96,7 @@
  * retries.
  */
 @Generated("by gapic-generator-java")
+@SuppressWarnings("CanonicalDuration")
 public class SpannerExecutorProxyStubSettings
     extends StubSettings<SpannerExecutorProxyStubSettings> {
   /** The default scopes of the service. */
@@ -194,6 +196,14 @@ protected SpannerExecutorProxyStubSettings(Builder settingsBuilder) throws IOExc
     executeActionAsyncSettings = settingsBuilder.executeActionAsyncSettings().build();
   }
 
+  @Override
+  protected LibraryMetadata getLibraryMetadata() {
+    return LibraryMetadata.newBuilder()
+        .setArtifactName("com.google.cloud:google-cloud-spanner")
+        .setRepository("googleapis/java-spanner")
+        .build();
+  }
+
   /** Builder for SpannerExecutorProxyStubSettings. */
   public static class Builder
       extends StubSettings.Builder<SpannerExecutorProxyStubSettings, Builder> {
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/stub/DatabaseAdminStubSettings.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/stub/DatabaseAdminStubSettings.java
@@ -43,6 +43,7 @@
 import com.google.api.gax.rpc.ApiCallContext;
 import com.google.api.gax.rpc.ApiClientHeaderProvider;
 import com.google.api.gax.rpc.ClientContext;
+import com.google.api.gax.rpc.LibraryMetadata;
 import com.google.api.gax.rpc.OperationCallSettings;
 import com.google.api.gax.rpc.PageContext;
 import com.google.api.gax.rpc.PagedCallSettings;
@@ -189,6 +190,7 @@
  * }</pre>
  */
 @Generated("by gapic-generator-java")
+@SuppressWarnings("CanonicalDuration")
 public class DatabaseAdminStubSettings extends StubSettings<DatabaseAdminStubSettings> {
   /** The default scopes of the service. */
   private static final ImmutableList<String> DEFAULT_SERVICE_SCOPES =
@@ -943,6 +945,14 @@ protected DatabaseAdminStubSettings(Builder settingsBuilder) throws IOException
         settingsBuilder.internalUpdateGraphOperationSettings().build();
   }
 
+  @Override
+  protected LibraryMetadata getLibraryMetadata() {
+    return LibraryMetadata.newBuilder()
+        .setArtifactName("com.google.cloud:google-cloud-spanner")
+        .setRepository("googleapis/java-spanner")
+        .build();
+  }
+
   /** Builder for DatabaseAdminStubSettings. */
   public static class Builder extends StubSettings.Builder<DatabaseAdminStubSettings, Builder> {
     private final ImmutableList<UnaryCallSettings.Builder<?, ?>> unaryMethodSettingsBuilders;
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/stub/InstanceAdminStubSettings.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/stub/InstanceAdminStubSettings.java
@@ -42,6 +42,7 @@
 import com.google.api.gax.rpc.ApiCallContext;
 import com.google.api.gax.rpc.ApiClientHeaderProvider;
 import com.google.api.gax.rpc.ClientContext;
+import com.google.api.gax.rpc.LibraryMetadata;
 import com.google.api.gax.rpc.OperationCallSettings;
 import com.google.api.gax.rpc.PageContext;
 import com.google.api.gax.rpc.PagedCallSettings;
@@ -179,6 +180,7 @@
  * }</pre>
  */
 @Generated("by gapic-generator-java")
+@SuppressWarnings("CanonicalDuration")
 public class InstanceAdminStubSettings extends StubSettings<InstanceAdminStubSettings> {
   /** The default scopes of the service. */
   private static final ImmutableList<String> DEFAULT_SERVICE_SCOPES =
@@ -905,6 +907,14 @@ protected InstanceAdminStubSettings(Builder settingsBuilder) throws IOException
     moveInstanceOperationSettings = settingsBuilder.moveInstanceOperationSettings().build();
   }
 
+  @Override
+  protected LibraryMetadata getLibraryMetadata() {
+    return LibraryMetadata.newBuilder()
+        .setArtifactName("com.google.cloud:google-cloud-spanner")
+        .setRepository("googleapis/java-spanner")
+        .build();
+  }
+
   /** Builder for InstanceAdminStubSettings. */
   public static class Builder extends StubSettings.Builder<InstanceAdminStubSettings, Builder> {
     private final ImmutableList<UnaryCallSettings.Builder<?, ?>> unaryMethodSettingsBuilders;
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/v1/stub/SpannerStubSettings.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/v1/stub/SpannerStubSettings.java
@@ -35,6 +35,7 @@
 import com.google.api.gax.rpc.ApiCallContext;
 import com.google.api.gax.rpc.ApiClientHeaderProvider;
 import com.google.api.gax.rpc.ClientContext;
+import com.google.api.gax.rpc.LibraryMetadata;
 import com.google.api.gax.rpc.PageContext;
 import com.google.api.gax.rpc.PagedCallSettings;
 import com.google.api.gax.rpc.PagedListDescriptor;
@@ -129,6 +130,7 @@
  * retries.
  */
 @Generated("by gapic-generator-java")
+@SuppressWarnings("CanonicalDuration")
 public class SpannerStubSettings extends StubSettings<SpannerStubSettings> {
   /** The default scopes of the service. */
   private static final ImmutableList<String> DEFAULT_SERVICE_SCOPES =
@@ -422,6 +424,14 @@ protected SpannerStubSettings(Builder settingsBuilder) throws IOException {
     batchWriteSettings = settingsBuilder.batchWriteSettings().build();
   }
 
+  @Override
+  protected LibraryMetadata getLibraryMetadata() {
+    return LibraryMetadata.newBuilder()
+        .setArtifactName("com.google.cloud:google-cloud-spanner")
+        .setRepository("googleapis/java-spanner")
+        .build();
+  }
+
   /** Builder for SpannerStubSettings. */
   public static class Builder extends StubSettings.Builder<SpannerStubSettings, Builder> {
     private final ImmutableList<UnaryCallSettings.Builder<?, ?>> unaryMethodSettingsBuilders;
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-spanner</artifactId>
-      <version>6.110.0</version>
+      <version>6.112.0</version>
     </dependency>
     <!-- [END spanner_install_without_bom] -->
     

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`# Configure the docker image for kokoro-trampoline.`
`4`	`4`	`env_vars: {`
`5`	`5`	`key: "TRAMPOLINE_IMAGE"`
`6`		`- value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.57.0" # {x-version-update:google-cloud-shared-dependencies:current}`
	`6`	`+ value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.58.0" # {x-version-update:google-cloud-shared-dependencies:current}`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`env_vars: {`