Merge branch 'main' into bigtable-v2-samples

Author: jinseopkim0

.github/workflows/librarian_generation_check.yaml

@@ -11,7 +11,7 @@
 # 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.
-name: Librarian generate diff check on pull requests
+name: Librarian - Generate diff check on pull requests
 on:
   pull_request:
 

.github/workflows/showcase-version-check.yaml

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-name: Showcase Version Check
+name: Librarian - Showcase Version Check
 
 on:
   schedule:

.github/workflows/update_librarian_googleapis.yaml

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-name: Update librarian googleapis commitish
+name: Librarian - Update googleapis commitish and generate all
 on:
   schedule:
   - cron: '0 3 * * *' # Run once a day at 3:00 AM UTC
@@ -85,6 +85,7 @@ jobs:
           echo "has_changes=true" >> $GITHUB_OUTPUT
         fi
     - name: Install protoc
+      if: steps.detect_librarian.outputs.has_changes == 'true'
       run: |
         set -e
         VERSION="33.2"
@@ -93,42 +94,37 @@ jobs:
         sudo unzip -o /tmp/protoc.zip
         protoc --version
     - uses: actions/setup-java@v4
+      if: steps.detect_librarian.outputs.has_changes == 'true'
       with:
         java-version: "17"
         distribution: "temurin"
         cache: "maven"
     - name: Verify Java and Maven installation
+      if: steps.detect_librarian.outputs.has_changes == 'true'
       run: |
         java -version
         if ! command -v mvn &> /dev/null; then
           sudo apt-get update && sudo apt-get install -y maven
         fi
         mvn -version
     - uses: actions/setup-python@v5
+      if: steps.detect_librarian.outputs.has_changes == 'true'
       with:
         python-version: "3.12"
         cache: 'pip'
     - name: Run librarian install
+      if: steps.detect_librarian.outputs.has_changes == 'true'
       run: |
         go run github.com/googleapis/librarian/cmd/librarian@latest install
         echo "$HOME/java_tools/bin" >> $GITHUB_PATH
       env:
         PYTHONPATH: ${{ github.workspace }}/sdk-platform-java/hermetic_build/library_generation/owlbot
     - name: Generate Libraries
       if: steps.detect_librarian.outputs.has_changes == 'true'
-      id: generate
       run: |
         go run github.com/googleapis/librarian/cmd/librarian@latest generate --all
-        git add .
-        changed_files=$(git diff --cached --name-only)
-        if [[ "${changed_files}" == "" ]]; then
-          echo "has_changes=false" >> $GITHUB_OUTPUT
-          echo "No changes in libraries"
-        else
-          echo "has_changes=true" >> $GITHUB_OUTPUT
-        fi
     - name: Commit and Create PR
-      if: steps.detect_librarian.outputs.has_changes == 'true' || steps.generate.outputs.has_changes == 'true'
+      if: steps.detect_librarian.outputs.has_changes == 'true'
       env:
         GH_TOKEN: ${{ secrets.CLOUD_JAVA_BOT_GITHUB_TOKEN }}
         PR_TITLE: "chore: update googleapis commitish to ${{ steps.commit.outputs.short_commit }}"
@@ -139,7 +135,7 @@ jobs:
         if [ "${{ github.event_name }}" = "pull_request" ]; then
           echo "=== PR Test: DRY RUN MODE ACTIVE ==="
           echo "Would have checked out branch: update-librarian-googleapis-main"
-          echo "Would have committed with title: $PR_TITLE"
+          echo "Would have committed configs with title: $PR_TITLE"
           echo "Would have pushed branch and created PR."
           exit 0
         fi
@@ -153,8 +149,22 @@ jobs:
         # Create and switch to the branch (force checkout -B to discard any local state on this branch name if it existed)
         git checkout -B "${current_branch}"
         
-        # Commit the changes (they are already staged by the Detect Changes step!)
-        git commit -m "${PR_TITLE}"
+        # 1. Commit Config Changes
+        # Ensure they are staged
+        git add librarian.yaml generation_config.yaml
+        if ! git diff --cached --quiet; then
+          git commit -m "${PR_TITLE}"
+        else
+          echo "No config changes to commit"
+        fi
+        
+        # 2. Commit Generated Code
+        git add .
+        if ! git diff --cached --quiet; then
+          git commit -m "chore: generate libraries"
+        else
+          echo "No generated code changes to commit"
+        fi
         
         # Push to remote (force push to overwrite any stale branch on remote)
         git remote add remote_repo https://cloud-java-bot:"${GH_TOKEN}@github.com/${{ github.repository }}.git" || git remote set-url remote_repo https://cloud-java-bot:"${GH_TOKEN}@github.com/${{ github.repository }}.git"

generation_config.yaml

@@ -1442,7 +1442,7 @@ libraries:
   GAPICs:
   - proto_path: google/iam/admin/v1
 - api_shortname: iam-policy
-  name_pretty: IAM
+  name_pretty: Cloud IAM Policy
   product_documentation: n/a
   api_description: n/a
   release_level: stable

java-datastore/datastore-v1-proto-client/pom.xml

@@ -107,6 +107,11 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>com.google.api</groupId>
+      <artifactId>gax</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>

java-datastore/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/it/ITDatastoreProtoClientTest.java

@@ -18,6 +18,16 @@
 import static com.google.datastore.v1.client.DatastoreHelper.makeFilter;
 import static com.google.datastore.v1.client.DatastoreHelper.makeValue;
 
+import com.google.api.core.ApiClock;
+import com.google.api.core.ApiFuture;
+import com.google.api.core.NanoClock;
+import com.google.api.gax.retrying.BasicResultRetryAlgorithm;
+import com.google.api.gax.retrying.DirectRetryingExecutor;
+import com.google.api.gax.retrying.ExponentialRetryAlgorithm;
+import com.google.api.gax.retrying.ResultRetryAlgorithmWithContext;
+import com.google.api.gax.retrying.RetryAlgorithm;
+import com.google.api.gax.retrying.RetrySettings;
+import com.google.api.gax.retrying.RetryingFuture;
 import com.google.common.truth.Truth;
 import com.google.datastore.v1.Filter;
 import com.google.datastore.v1.KindExpression;
@@ -27,9 +37,13 @@
 import com.google.datastore.v1.client.Datastore;
 import com.google.datastore.v1.client.DatastoreException;
 import com.google.datastore.v1.client.DatastoreHelper;
+import com.google.rpc.Code;
 import java.io.IOException;
 import java.security.GeneralSecurityException;
+import java.time.Duration;
 import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -48,7 +62,7 @@ public void setUp() throws GeneralSecurityException, IOException {
   }
 
   @Test
-  public void testQuerySplitterWithDefaultDb() throws DatastoreException {
+  public void testQuerySplitterWithDefaultDb() throws Exception {
     Filter propertyFilter =
         makeFilter("foo", PropertyFilter.Operator.EQUAL, makeValue("value")).build();
     Query query =
@@ -59,8 +73,7 @@ public void testQuerySplitterWithDefaultDb() throws DatastoreException {
 
     PARTITION = PartitionId.newBuilder().setProjectId(PROJECT_ID).build();
 
-    List<Query> splits =
-        DatastoreHelper.getQuerySplitter().getSplits(query, PARTITION, 2, DATASTORE);
+    List<Query> splits = getSplitsWithRetry(query, PARTITION, 2, DATASTORE);
     Truth.assertThat(splits).isNotEmpty();
     splits.forEach(
         split -> {
@@ -70,7 +83,7 @@ public void testQuerySplitterWithDefaultDb() throws DatastoreException {
   }
 
   @Test
-  public void testQuerySplitterWithDb() throws DatastoreException {
+  public void testQuerySplitterWithDb() throws Exception {
     Filter propertyFilter =
         makeFilter("foo", PropertyFilter.Operator.EQUAL, makeValue("value")).build();
     Query query =
@@ -81,8 +94,7 @@ public void testQuerySplitterWithDb() throws DatastoreException {
 
     PARTITION = PartitionId.newBuilder().setProjectId(PROJECT_ID).setDatabaseId("test-db").build();
 
-    List<Query> splits =
-        DatastoreHelper.getQuerySplitter().getSplits(query, PARTITION, 2, DATASTORE);
+    List<Query> splits = getSplitsWithRetry(query, PARTITION, 2, DATASTORE);
 
     Truth.assertThat(splits).isNotEmpty();
     splits.forEach(
@@ -91,4 +103,85 @@ public void testQuerySplitterWithDb() throws DatastoreException {
           Truth.assertThat(split.getFilter()).isEqualTo(propertyFilter);
         });
   }
+
+  /**
+   * A generic helper method that executes a {@link Callable} with retries using the GAX retrying
+   * framework.
+   *
+   * <p>It configures a {@link DirectRetryingExecutor} with the provided {@link RetrySettings} and
+   * the custom {@link ResultRetryAlgorithmWithContext}.
+   *
+   * @param callable the action to execute
+   * @param retrySettings the retry configuration (backoff, max attempts, timeouts)
+   * @param resultRetryAlgorithm the algorithm to determine if a failed attempt should be retried
+   * @return the result of the callable execution
+   * @throws Exception if the execution fails after all retry attempts.
+   */
+  private static <V> V runWithRetry(
+      Callable<V> callable,
+      RetrySettings retrySettings,
+      ResultRetryAlgorithmWithContext<V> resultRetryAlgorithm)
+      throws Exception {
+    ApiClock clock = NanoClock.getDefaultClock();
+    // We must wrap the result algorithm and timed algorithm into a RetryAlgorithm
+    // as required by DirectRetryingExecutor.
+    RetryAlgorithm<V> retryAlgorithm =
+        new RetryAlgorithm<>(
+            resultRetryAlgorithm, new ExponentialRetryAlgorithm(retrySettings, clock));
+
+    DirectRetryingExecutor<V> executor = new DirectRetryingExecutor<>(retryAlgorithm);
+    RetryingFuture<V> future = executor.createFuture(callable);
+
+    ApiFuture<V> submittedFuture = executor.submit(future);
+
+    try {
+      return submittedFuture.get();
+    } catch (ExecutionException e) {
+      Throwable cause = e.getCause();
+      // submittedFuture.get() wraps any exception thrown during execution in an ExecutionException.
+      // We unwrap and rethrow the actual cause (Exception or Error) directly so that test failures
+      // report the root cause (e.g., DatastoreException or AssertionError) instead of the wrapper.
+      if (cause instanceof Exception) {
+        throw (Exception) cause;
+      }
+      if (cause instanceof Error) {
+        throw (Error) cause;
+      }
+      throw e;
+    } catch (InterruptedException e) {
+      // Restore the interrupted status before rethrowing, as per Java concurrency best practices.
+      Thread.currentThread().interrupt();
+      throw e;
+    }
+  }
+
+  // This low-level Datastore client (proto-over-HTTP) does not have built-in retry logic
+  // (unlike the high-level google-cloud-datastore gRPC client). We must explicitly retry
+  // here to handle transient backend errors (such as Code.INTERNAL auth issues).
+  // We reuse GAX retrying utilities here in the test to implement this backoff/retry.
+  private static List<Query> getSplitsWithRetry(
+      Query query, PartitionId partition, int numSplits, Datastore datastore) throws Exception {
+    // Fail fast configuration to avoid long wait times during test failures
+    RetrySettings retrySettings =
+        RetrySettings.newBuilder()
+            .setMaxAttempts(3)
+            .setInitialRetryDelayDuration(Duration.ofMillis(200))
+            .setRetryDelayMultiplier(1.5)
+            .setMaxRetryDelayDuration(Duration.ofMillis(500))
+            .setTotalTimeoutDuration(Duration.ofSeconds(2))
+            .build();
+    return runWithRetry(
+        () -> DatastoreHelper.getQuerySplitter().getSplits(query, partition, numSplits, datastore),
+        retrySettings,
+        new BasicResultRetryAlgorithm<List<Query>>() {
+          @Override
+          public boolean shouldRetry(Throwable prevThrowable, List<Query> prevResult) {
+            if (prevThrowable instanceof DatastoreException) {
+              DatastoreException de = (DatastoreException) prevThrowable;
+              return de.getCode() == Code.INTERNAL;
+            }
+            return false;
+          }
+        });
+  }
 }

java-datastore/google-cloud-datastore-utils/pom.xml

@@ -84,6 +84,11 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>com.google.api</groupId>
+            <artifactId>gax</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>