Merge branch 'main' into jdbc/otel-clean-branch

Author: keshavdandeva

.github/CODEOWNERS

@@ -9,3 +9,7 @@
 /java-vertexai/   @googleapis/vertexai-team @googleapis/cloud-sdk-java-team
 /java-bigquerystorage/ @googleapis/bigquery-team @googleapis/cloud-sdk-java-team
 /java-bigquery/ @googleapis/bigquery-team @googleapis/cloud-sdk-java-team
+/java-spanner/ @googleapis/spanner-team @googleapis/cloud-sdk-java-team
+/java-spanner-jdbc/ @googleapis/spanner-team @googleapis/cloud-sdk-java-team
+/google-auth-library-java/ @googleapis/cloud-sdk-auth-team @googleapis/cloud-sdk-java-team
+/java-storage/ @googleapis/gcs-team @googleapis/cloud-sdk-java-team

.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

@@ -53,6 +53,86 @@ jobs:
       id: date
       run: echo "::set-output name=week_of_year::$(date +'%W' --utc)"
     - uses: actions/checkout@v4
+    - uses: actions/setup-java@v4
+      with:
+        java-version: 8
+        distribution: temurin
+    - name: "Set jvm system property environment variable for surefire plugin (unit tests)"
+      # Maven surefire plugin (unit tests) allows us to specify JVM to run the tests.
+      # https://maven.apache.org/surefire/maven-surefire-plugin/test-mojo.html#jvm
+      run: echo "SUREFIRE_JVM_OPT=-Djvm=${JAVA_HOME}/bin/java" >> $GITHUB_ENV
+      shell: bash    
+    - uses: actions/setup-java@v4
+      with:
+        java-version: 11
+        distribution: temurin
+        cache: maven
+    - uses: actions/cache@v4
+      id: mvn-cache
+      with:
+        path: ~/.m2/repository
+        key: ${{ runner.os }}-maven-unified-${{ steps.date.outputs.week_of_year }}
+    - run: .kokoro/build.sh
+      shell: bash      
+      env:
+        JOB_TYPE: test
+        JOB_NAME: units-8-runtime-${{matrix.java}}
+  # detect which libraries have changed
+  changes:
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: read
+    outputs:
+      packages: ${{ steps.filter.outputs.changes }}
+    steps:
+    - uses: dorny/paths-filter@v4
+      id: filter
+      with:
+        filters: |
+          java-bigquery: java-bigquery/**
+          java-bigquerystorage: java-bigquerystorage/**
+          java-datastore: java-datastore/**
+          java-logging-logback: java-logging-logback/**
+          java-logging: java-logging/**
+          java-spanner: java-spanner/**
+          java-storage: java-storage/**
+          sdk-platform-java: sdk-platform-java/**
+  split-units:
+    runs-on: ubuntu-latest
+    needs: changes
+    strategy:
+      fail-fast: false
+      matrix:
+        package: ${{ fromJSON(needs.changes.outputs.packages) }}
+        java: [11, 17, 21, 25]
+    steps:
+    - name: Get current week within the year
+      id: date
+      run: echo "::set-output name=week_of_year::$(date +'%W' --utc)"
+    - uses: actions/checkout@v4
+    - uses: actions/setup-java@v4
+      with:
+        distribution: temurin
+        java-version: ${{matrix.java}}
+    - run: .kokoro/build.sh
+      env:
+        BUILD_SUBDIR: ${{matrix.package}}
+        JOB_TYPE: test
+        JOB_NAME: units-${{matrix.package}}-${{matrix.java}}
+  split-units-8:
+    runs-on: ubuntu-latest
+    name: "split-units"
+    needs: changes
+    strategy:
+      fail-fast: false
+      matrix:
+        package: ${{ fromJSON(needs.changes.outputs.packages) }}
+        java: [8]
+    steps:
+    - name: Get current week within the year
+      id: date
+      run: echo "::set-output name=week_of_year::$(date +'%W' --utc)"
+    - uses: actions/checkout@v4
     - uses: actions/setup-java@v4
       with:
         java-version: 11
@@ -66,15 +146,16 @@ jobs:
         key: ${{ runner.os }}-maven-unified-${{ steps.date.outputs.week_of_year }}
     - name: Install all modules using Java 11
       shell: bash
-      run: |
-        mvn -V -B -ntp clean install -DskipTests -Dfmt.skip -Dclirr.skip -Denforcer.skip -Dcheckstyle.skip -Dflatten.skip -Danimal-sniffer.skip -Djacoco.skip
-      working-directory: sdk-platform-java
+      run: .kokoro/build.sh
+      env:
+        BUILD_SUBDIR: ${{matrix.package}}
+        JOB_TYPE: install
     - uses: actions/setup-java@v4
       with:
-        java-version: 8
+        java-version: ${{matrix.java}}
         distribution: temurin
     - run: java -version
-    - name: Run tests in Java 8 with the source compiled in Java 11
+    - name: Run tests in Java ${{matrix.java}} with the source compiled in Java 11
       run: |
         mvn test \
           -B -ntp \
@@ -86,11 +167,13 @@ jobs:
           -Dflatten.skip=true \
           -Danimal.sniffer.skip=true \
           -Dmaven.wagon.http.retryHandler.count=5 \
+          --also-make \
           -T 1C
       env:
+        BUILD_SUBDIR: ${{matrix.package}}
         JOB_TYPE: test
         JOB_NAME: units-8-runtime-${{matrix.java}}
-      working-directory: sdk-platform-java
+      working-directory: ${{matrix.package}}
   windows:
     runs-on: windows-latest
     steps:

.github/workflows/ci.yaml

@@ -173,6 +173,7 @@ jobs:
             |grep --invert-match 'java/com/google' \
             |grep --invert-match '/test/' \
             |grep --invert-match '/tests/' \
+            |grep --invert-match '/javatests/' \
             |grep --invert-match samples \
             |grep --invert-match benchmark \
             |grep --invert-match grafeas \

.github/workflows/generated_files_sync.yaml

@@ -0,0 +1,56 @@
+# Copyright 2022 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
+#
+#      http://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.
+# GitHub action job to test core java library features on
+# downstream client libraries before they are released.
+on:
+  push:
+    branches:
+    - main
+  pull_request:
+name: google-auth-library-java ci
+env:
+  BUILD_SUBDIR: google-auth-library-java
+jobs:
+  filter:
+    runs-on: ubuntu-latest
+    outputs:
+      library: ${{ steps.filter.outputs.library }}
+    steps:
+    - uses: actions/checkout@v4
+    - uses: dorny/paths-filter@v3
+      id: filter
+      with:
+        filters: |
+          library:
+            - 'google-auth-library-java/**'
+  units-logging:
+    needs: filter
+    if: ${{ needs.filter.outputs.library == 'true' }}
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        java: [11, 17, 21, 25]
+    steps:
+    - uses: actions/checkout@v4
+    - uses: actions/setup-java@v4
+      with:
+        distribution: temurin
+        java-version: ${{matrix.java}}
+    - run: java -version
+    - run: .kokoro/build.sh
+      env:
+        BUILD_SUBDIR: google-auth-library-java
+        JOB_TYPE: test
+        SUREFIRE_JVM_OPT: "-P '!slf4j2x,slf4j2x-test'"

.github/workflows/google-auth-library-java-ci.yaml

@@ -0,0 +1,45 @@
+on:
+  push:
+    branches:
+    - main
+  pull_request:
+name: java-spanner integration-tests-against-emulator
+jobs:
+  filter:
+    runs-on: ubuntu-latest
+    outputs:
+      library: ${{ steps.filter.outputs.library }}
+    steps:
+    - uses: actions/checkout@v4
+    - uses: dorny/paths-filter@v3
+      id: filter
+      with:
+        filters: |
+          library:
+            - 'java-spanner/**'
+  units:
+    needs: filter
+    if: ${{ needs.filter.outputs.library == 'true' }}
+    runs-on: ubuntu-latest
+
+    services:
+      emulator:
+        image: gcr.io/cloud-spanner-emulator/emulator:latest
+        ports:
+          - 9010:9010
+          - 9020:9020
+
+    steps:
+    - uses: actions/checkout@v6
+    - uses: actions/setup-java@v5
+      with:
+        distribution: temurin
+        java-version: 11
+    - name: Running tests
+      run: .kokoro/build.sh
+      env:
+        JOB_TYPE: test
+        BUILD_SUBDIR: java-spanner
+        SPANNER_EMULATOR_HOST: localhost:9010
+        GOOGLE_CLOUD_PROJECT: emulator-test-project
+        SUREFIRE_JVM_OPT: '-Penable-integration-tests -DskipUnitTests=true -Dspanner.testenv.instance="" -Dmaven.main.skip=true'

.github/workflows/java-spanner-integration-tests-against-emulator.yaml

@@ -18,9 +18,9 @@ on:
     branches:
     - main
   pull_request:
-name: java-bigquery ci
+name: java-spanner-jdbc ci
 env:
-  BUILD_SUBDIR: java-bigquery
+  BUILD_SUBDIR: java-spanner-jdbc
 jobs:
   filter:
     runs-on: ubuntu-latest
@@ -33,7 +33,7 @@ jobs:
       with:
         filters: |
           library:
-            - 'java-bigquery/**'
+            - 'java-spanner-jdbc/**'
   units:
     needs: filter
     if: ${{ needs.filter.outputs.library == 'true' }}

.github/workflows/java-bigquery-ci.yaml …thub/workflows/java-spanner-jdbc-ci.yaml.github/workflows/java-bigquery-ci.yaml renamed to .github/workflows/java-spanner-jdbc-ci.yaml .github/workflows/java-bigquery-ci.yaml renamed to .github/workflows/java-spanner-jdbc-ci.yaml

@@ -0,0 +1,49 @@
+on:
+  push:
+    branches:
+    - main
+  pull_request:
+name: java-spanner-jdbc Integration tests against emulator
+env:
+  BUILD_SUBDIR: java-spanner-jdbc
+jobs:
+  filter:
+    runs-on: ubuntu-latest
+    outputs:
+      library: ${{ steps.filter.outputs.library }}
+    steps:
+    - uses: actions/checkout@v4
+    - uses: dorny/paths-filter@v3
+      id: filter
+      with:
+        filters: |
+          library:
+            - 'java-spanner-jdbc/**'
+  tests-against-emulator:
+    needs: filter
+    if: ${{ needs.filter.outputs.library == 'true' }}
+    runs-on: ubuntu-latest
+
+    services:
+      emulator:
+        image: gcr.io/cloud-spanner-emulator/emulator:latest
+        ports:
+          - 9010:9010
+          - 9020:9020
+
+    steps:
+    - uses: actions/checkout@v6
+    - uses: actions/setup-java@v5
+      with:
+        distribution: temurin
+        java-version: 17
+    - run: java -version
+    - name: Install dependencies for the integration test
+      run: .kokoro/build.sh
+      env:
+        JOB_TYPE: test
+    - run: mvn -B -Dspanner.testenv.instance="" -Penable-integration-tests -DtrimStackTrace=false -Dclirr.skip=true -Denforcer.skip=true -fae verify
+      working-directory: java-spanner-jdbc
+      env:
+        SPANNER_EMULATOR_HOST: localhost:9010
+        GOOGLE_CLOUD_PROJECT: emulator-test-project

.github/workflows/java-spanner-jdbc-integration-tests-against-emulator.yaml

@@ -0,0 +1,46 @@
+# Copyright 2024 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
+#
+#      http://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.
+# Github action job to test core java library features on
+# downstream client libraries before they are released.
+on:
+  pull_request:
+name: java-spanner-jdbc quickperf
+env:
+  BUILD_SUBDIR: java-spanner-jdbc
+jobs:
+  filter:
+    runs-on: ubuntu-latest
+    outputs:
+      library: ${{ steps.filter.outputs.library }}
+    steps:
+    - uses: actions/checkout@v4
+    - uses: dorny/paths-filter@v3
+      id: filter
+      with:
+        filters: |
+          library:
+            - 'java-spanner-jdbc/**'
+  quickperf:
+    needs: filter
+    if: ${{ needs.filter.outputs.library == 'true' }}
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+      - uses: actions/setup-java@v5
+        with:
+          distribution: temurin
+          java-version: 17
+      - name: Run tests
+        run: mvn test
+        working-directory: java-spanner-jdbc/samples/quickperf