Merge branch 'main' into x-goog-spanner-request-id-setup-e2e-expectations

Author: rahul2393

.github/release-please.yml

@@ -46,3 +46,7 @@ branches:
     bumpMinorPreMajor: true
     handleGHRelease: true
     branch: 6.88.x
+  - releaseType: java-backport
+    bumpMinorPreMajor: true
+    handleGHRelease: true
+    branch: 6.96.x

.github/sync-repo-settings.yaml

@@ -182,6 +182,27 @@ branchProtectionRules:
       - units-with-multiplexed-session (11)
       - unmanaged_dependency_check
       - library_generation
+  - pattern: 6.96.x
+    isAdminEnforced: true
+    requiredApprovingReviewCount: 1
+    requiresCodeOwnerReviews: true
+    requiresStrictStatusChecks: false
+    requiredStatusCheckContexts:
+      - dependencies (17)
+      - lint
+      - javadoc
+      - units (8)
+      - units (11)
+      - 'Kokoro - Test: Integration'
+      - 'Kokoro - Test: Integration with Multiplexed Sessions'
+      - cla/google
+      - checkstyle
+      - compile (8)
+      - compile (11)
+      - units-with-multiplexed-session (8)
+      - units-with-multiplexed-session (11)
+      - unmanaged_dependency_check
+      - library_generation
 permissionRules:
   - team: yoshi-admins
     permission: admin

google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/GapicSpannerRpc.java

@@ -344,8 +344,6 @@ public GapicSpannerRpc(final SpannerOptions options) {
           InstantiatingGrpcChannelProvider.newBuilder()
               .setChannelConfigurator(options.getChannelConfigurator())
               .setEndpoint(options.getEndpoint())
-              .setMaxInboundMessageSize(MAX_MESSAGE_SIZE)
-              .setMaxInboundMetadataSize(MAX_METADATA_SIZE)
               .setPoolSize(options.getNumChannels())
 
               // Set a keepalive time of 120 seconds to help long running

google-cloud-spanner/src/test/java/com/google/cloud/spanner/ITTransactionRetryTest.java

@@ -0,0 +1,83 @@
+/*
+ * Copyright 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.cloud.spanner;
+
+import static com.google.cloud.spanner.testing.EmulatorSpannerHelper.isUsingEmulator;
+import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeFalse;
+
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+@Category(ParallelIntegrationTest.class)
+@RunWith(JUnit4.class)
+public class ITTransactionRetryTest {
+
+  @ClassRule public static IntegrationTestEnv env = new IntegrationTestEnv();
+
+  @Test
+  public void TestRetryInfo() {
+    assumeFalse("emulator does not support parallel transaction", isUsingEmulator());
+
+    // Creating a database with the table which contains INT64 columns
+    Database db =
+        env.getTestHelper()
+            .createTestDatabase("CREATE TABLE Test(ID INT64, " + "EMPID INT64) PRIMARY KEY (ID)");
+    DatabaseClient databaseClient = env.getTestHelper().getClient().getDatabaseClient(db.getId());
+
+    // Inserting one row
+    databaseClient
+        .readWriteTransaction()
+        .run(
+            transaction -> {
+              transaction.buffer(
+                  Mutation.newInsertBuilder("Test").set("ID").to(1).set("EMPID").to(1).build());
+              return null;
+            });
+
+    int numRetries = 10;
+    boolean isAbortedWithRetryInfo = false;
+    while (numRetries-- > 0) {
+      try (TransactionManager transactionManager1 = databaseClient.transactionManager()) {
+        try (TransactionManager transactionManager2 = databaseClient.transactionManager()) {
+          try {
+            TransactionContext transaction1 = transactionManager1.begin();
+            TransactionContext transaction2 = transactionManager2.begin();
+            transaction1.executeUpdate(
+                Statement.of("UPDATE Test SET EMPID = EMPID + 1 WHERE ID = 1"));
+            transaction2.executeUpdate(
+                Statement.of("UPDATE Test SET EMPID = EMPID + 1 WHERE ID = 1"));
+            transactionManager1.commit();
+            transactionManager2.commit();
+          } catch (AbortedException abortedException) {
+            assertThat(abortedException.getErrorCode()).isEqualTo(ErrorCode.ABORTED);
+            if (abortedException.getRetryDelayInMillis() > 0) {
+              isAbortedWithRetryInfo = true;
+              break;
+            }
+          }
+        }
+      }
+    }
+
+    assertTrue("Transaction is not aborted with the trailers", isAbortedWithRetryInfo);
+  }
+}