Merge branch 'main' into observability/tracing-attr-error-type-transfer

Author: diegomarquezp

.github/scripts/release_manager_merge_bot

@@ -213,7 +213,16 @@ func main() {
 		}
 
 		state = *status.State
-		log.Printf("Overall status: %s", state)
+		log.Printf("Overall commit status: %s", state)
+		if pr.MergeableState != nil {
+			log.Printf("PR mergeable state: %s", *pr.MergeableState)
+			if *pr.MergeableState == "dirty" {
+				fatalError("PR #%d has merge conflicts (dirty).", prNumber)
+			}
+			if *pr.MergeableState == "draft" {
+				fatalError("PR #%d is a draft.", prNumber)
+			}
+		}
 
 		switch state {
 		case "failure":
@@ -230,7 +239,19 @@ func main() {
 			}
 			retryCount++
 		case "success":
-			log.Println("All checks have passed. Merging the pull request...")
+			// Check if the PR is truly mergeable. MergeableState can be "blocked" if required
+			// check runs (e.g. GitHub Actions) or reviews are missing, even if CombinedStatus is "success".
+			// If it's nil, GitHub is still calculating mergeability.
+			if pr.MergeableState == nil || *pr.MergeableState == "blocked" || *pr.MergeableState == "behind" {
+				stateStr := "nil"
+				if pr.MergeableState != nil {
+					stateStr = *pr.MergeableState
+				}
+				log.Printf("Commit status is success, but PR mergeable state is %q. Waiting...", stateStr)
+				goto wait
+			}
+
+			log.Println("All checks have passed and PR is mergeable. Merging the pull request...")
 			commitMessage := fmt.Sprintf("Merge pull request #%d from %s/%s", prNumber, owner, repo)
 			mergeResult, _, err := client.PullRequests.Merge(ctx, owner, repo, prNumber, commitMessage, &github.PullRequestOptions{
 				MergeMethod: "squash",

.github/scripts/release_manager_merge_bot.go

@@ -69,9 +69,8 @@ jobs:
 
       # Set up local showcase server to run the showcase ITs
       - name: Parse showcase version
-        working-directory: sdk-plaform-java/java-showcase/gapic-showcase
+        working-directory: sdk-platform-java/java-showcase/gapic-showcase
         run: echo "SHOWCASE_VERSION=$(mvn help:evaluate -Dexpression=gapic-showcase.version -q -DforceStdout)" >> "$GITHUB_ENV"
-        working-directory: sdk-platform-java
       - name: Install showcase server
         run: |
           sudo mkdir -p /usr/src/showcase

.github/workflows/sdk-platform-java-dependency_compatibility_test.yaml

@@ -30,12 +30,11 @@ jobs:
             - 'sdk-platform-java/**'
   downstream-protobuf-test:
     needs: filter
-    if: ${{ needs.filter.outputs.library == 'true' }}
     # This job runs if any of the three conditions match:
     # 1. PR is raised from Release-Please (PR comes from branch: release-please--branches-main)
     # 2. Job is invoked by the nightly job (scheduled event)
     # 3. Job is manually invoked via Github UI (workflow_dispatch event)
-    if: github.head_ref == 'release-please--branches--main' || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
+    if: needs.filter.outputs.library == 'true' && (github.head_ref == 'release-please--branches--main' || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch')
     runs-on: ubuntu-22.04
     strategy:
       fail-fast: false

.github/workflows/sdk-platform-java-downstream_protobuf_compatibility_check_nightly.yaml

@@ -25,10 +25,9 @@ jobs:
             - 'sdk-platform-java/**'
   upper-bound-check:
     needs: filter
-    if: ${{ needs.filter.outputs.library == 'true' }}
+    if: needs.filter.outputs.library == 'true' && github.repository_owner == 'googleapis'
     name: Shared Dependencies BOM upper-bound check
     runs-on: ubuntu-latest
-    if: github.repository_owner == 'googleapis'
     steps:
     - uses: actions/checkout@v4
     - uses: actions/setup-java@v4

.github/workflows/sdk-platform-java-shared_dependencies.yaml

@@ -22,9 +22,8 @@ jobs:
             - 'sdk-platform-java/**'
   build:
     needs: filter
-    if: ${{ needs.filter.outputs.library == 'true' }}
+    if: needs.filter.outputs.library == 'true' && (github.event.pull_request.head.repo.full_name == github.repository || github.event_name != 'pull_request')
     name: Build
-    if: github.event.pull_request.head.repo.full_name == github.repository || github.event_name != 'pull_request'
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3

.github/workflows/sdk-platform-java-sonar.yaml

@@ -55,11 +55,9 @@ jobs:
         head_repo_name: ${{ github.event.pull_request.head.repo.full_name  }}
         base_repo: ${{ github.repository }}
   library-generation-unit-tests:
-    needs: filter
-    if: ${{ needs.filter.outputs.library == 'true' }}
+    needs: [filter, should-run-library-generation-tests]
+    if: needs.filter.outputs.library == 'true' && needs.should-run-library-generation-tests.outputs.should_run == 'true'
     runs-on: ubuntu-22.04
-    needs: should-run-library-generation-tests
-    if: needs.should-run-library-generation-tests.outputs.should_run == 'true'
     steps:
     - uses: actions/checkout@v4
     - uses: actions/setup-python@v5
@@ -85,11 +83,9 @@ jobs:
         set -x
         python -m unittest discover -s hermetic_build -p "*unit_tests.py"
   library-generation-lint-shell:
-    needs: filter
-    if: ${{ needs.filter.outputs.library == 'true' }}
+    needs: [filter, should-run-library-generation-tests]
+    if: needs.filter.outputs.library == 'true' && needs.should-run-library-generation-tests.outputs.should_run == 'true'
     runs-on: ubuntu-22.04
-    needs: should-run-library-generation-tests
-    if: needs.should-run-library-generation-tests.outputs.should_run == 'true'
     steps:
     - uses: actions/checkout@v4
     - name: Run ShellCheck
@@ -101,11 +97,9 @@ jobs:
         ignore_paths: 
           .kokoro
   library-generation-lint-python:
-    needs: filter
-    if: ${{ needs.filter.outputs.library == 'true' }}
+    needs: [filter, should-run-library-generation-tests]
+    if: needs.filter.outputs.library == 'true' && needs.should-run-library-generation-tests.outputs.should_run == 'true'
     runs-on: ubuntu-22.04
-    needs: should-run-library-generation-tests
-    if: needs.should-run-library-generation-tests.outputs.should_run == 'true'
     steps:
     - uses: actions/checkout@v4
     - uses: actions/setup-python@v5

.github/workflows/sdk-platform-java-verify_library_generation.yaml

@@ -344,20 +344,20 @@ function run_graalvm_tests() {
 function generate_graalvm_presubmit_modules_list() {
   modules_assigned_list=()
   generate_modified_modules_list
-  if [[ ${#modified_module_list[@]} -gt 4 ]]; then
-    # Too many modules modified, run a subset
-    echo "Too many modules modified, running a subset"
-    module_list="java-aiplatform,java-compute"
-  elif [[ ${#modified_module_list[@]} -gt 0 ]]; then
+  if [[ ${#modified_module_list[@]} -gt 0 && ${#modified_module_list[@]} -lt 5 ]]; then
     # If only a few modules have been modified, focus presubmit testing only on them.
     module_list=$(
       IFS=,
       echo "${modified_module_list[*]}"
     )
   else
-    # no modules modified
-    echo "No modules modified"
-    module_list=""
+    # If no modules have been modified or if too many have been modified, just test the modules
+    # specified in the MAVEN_MODULES env var.
+    if [ -z "${MAVEN_MODULES}" ]; then
+      echo "MAVEN_MODULES not defined in environment."
+      exit 1
+    fi
+    module_list=${MAVEN_MODULES}
   fi
 }
 

.kokoro/common.sh

@@ -31,3 +31,8 @@ env_vars: {
   key: "SECRET_MANAGER_KEYS"
   value: "cloud-java-ci-it-service-account, java-bigqueryconnection-samples-secrets"
 }
+
+env_vars: {
+  key: "MAVEN_MODULES"
+  value: "java-aiplatform,java-compute"
+}

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

@@ -31,3 +31,8 @@ env_vars: {
   key: "SECRET_MANAGER_KEYS"
   value: "cloud-java-ci-it-service-account, java-bigqueryconnection-samples-secrets"
 }
+
+env_vars: {
+  key: "MAVEN_MODULES"
+  value: "java-aiplatform,java-compute"
+}