Merge branch 'main' into rety

Author: ldetmer

.github/CODEOWNERS

@@ -9,3 +9,4 @@
 /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

.github/workflows/java-spanner-integration-tests-against-emulator.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'

.kokoro/build.sh

@@ -245,10 +245,12 @@ case ${JOB_TYPE} in
                 if [ -f "${dir}/pom.xml" ] && [ "${dir}" != "." ]; then
                     # Filter out directories not participating in the default formatting reactor:
                     # - samples are handwritten by developers
+                    # - benchmarks are handwritten by developers
                     # - proto-*/grpc-* are generated code and should use the compiler format
                     # - *-bom/parents are POM-only and contain no Java source
                     if [[ "${dir}" != *"samples"* ]] && \
                        [[ "${dir}" != *"java-showcase"* ]] && \
+                       [[ "$(basename "${dir}")" != *"benchmark"* ]] && \
                        [[ "$(basename "${dir}")" != "proto-google-"* ]] && \
                        [[ "$(basename "${dir}")" != "grpc-google-"* ]] && \
                        [[ "$(basename "${dir}")" != *"-bom" ]] && \

.kokoro/common.sh

@@ -29,6 +29,7 @@ excluded_modules=(
   'sdk-platform-java/java-showcase'
   'sdk-platform-java/java-showcase-3.21.0'
   'sdk-platform-java/java-showcase-3.25.8'
+  'java-spanner'
 )
 
 function retry_with_backoff {

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

@@ -0,0 +1,42 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# 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}
+}
+
+env_vars: {
+  key: "JOB_TYPE"
+  value: "graalvm-single"
+}
+
+# TODO: remove this after we've migrated all tests and scripts
+env_vars: {
+  key: "GCLOUD_PROJECT"
+  value: "gcloud-devel"
+}
+
+env_vars: {
+  key: "GOOGLE_CLOUD_PROJECT"
+  value: "gcloud-devel"
+}
+
+env_vars: {
+  key: "GOOGLE_APPLICATION_CREDENTIALS"
+  value: "secret_manager/java-it-service-account"
+}
+
+env_vars: {
+  key: "SECRET_MANAGER_KEYS"
+  value: "java-it-service-account"
+}
+
+env_vars: {
+  key: "IT_SERVICE_ACCOUNT_EMAIL"
+  value: "it-service-account@gcloud-devel.iam.gserviceaccount.com"
+}
+env_vars: {
+  key: "BUILD_SUBDIR"
+  value: "java-spanner"
+}

.kokoro/presubmit/spanner-integration.cfg

@@ -0,0 +1,39 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/java11"
+}
+
+env_vars: {
+  key: "JOB_TYPE"
+  value: "integration-single"
+}
+
+# TODO: remove this after we've migrated all tests and scripts
+env_vars: {
+  key: "GCLOUD_PROJECT"
+  value: "gcloud-devel"
+}
+
+env_vars: {
+  key: "GOOGLE_CLOUD_PROJECT"
+  value: "gcloud-devel"
+}
+
+env_vars: {
+  key: "GOOGLE_APPLICATION_CREDENTIALS"
+  value: "secret_manager/java-it-service-account"
+}
+
+env_vars: {
+  key: "SECRET_MANAGER_KEYS"
+  value: "java-it-service-account"
+}
+
+
+env_vars: {
+  key: "BUILD_SUBDIR"
+  value: "java-spanner"
+}

gapic-libraries-bom/pom.xml

@@ -1242,6 +1242,13 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <dependency>
+        <groupId>com.google.cloud</groupId>
+        <artifactId>google-cloud-spanner-bom</artifactId>
+        <version>6.112.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-spanneradapter-bom</artifactId>

generation/check_non_release_please_versions.sh

@@ -13,6 +13,7 @@ for pomFile in $(find . -mindepth 2 -name pom.xml | sort ); do
       [[ "${pomFile}" =~ .*java-logging-logback.* ]] || \
       [[ "${pomFile}" =~ .*java-bigquery.* ]] || \
       [[ "${pomFile}" =~ .*sdk-platform-java.* ]] || \
+      [[ "${pomFile}" =~ .*java-spanner.* ]] || \
       [[ "${pomFile}" =~ .*.github*. ]]; then
     continue
   fi

generation_config.yaml

@@ -622,29 +622,6 @@ libraries:
   GAPICs:
   - proto_path: google/cloud/support/v2
   - proto_path: google/cloud/support/v2beta
-# - api_shortname: common-protos
-#   name_pretty: Common Protos
-#   product_documentation: https://github.com/googleapis/api-common-protos
-#   api_description: Protobuf classes for Google's common protos.
-#   release_level: stable
-#   client_documentation: https://cloud.google.com/java/docs/reference/proto-google-common-protos/latest/history
-#   distribution_name: com.google.api.grpc:proto-google-common-protos
-#   excluded_dependencies: proto-google-common-protos,grpc-google-common-protos,proto-google-common-protos-parent
-#   excluded_poms: proto-google-common-protos-bom,proto-google-common-protos
-#   library_type: OTHER
-#   GAPICs:
-#   - proto_path: google/api
-#   - proto_path: google/apps/card/v1
-#   - proto_path: google/cloud
-#   - proto_path: google/cloud/audit
-#   - proto_path: google/cloud/location
-#   - proto_path: google/geo/type
-#   - proto_path: google/logging/type
-#   - proto_path: google/longrunning
-#   - proto_path: google/rpc
-#   - proto_path: google/rpc/context
-#   - proto_path: google/shopping/type
-#   - proto_path: google/type
 - api_shortname: compute
   name_pretty: Compute Engine
   product_documentation: https://cloud.google.com/compute/
@@ -2490,15 +2467,32 @@ libraries:
   - proto_path: google/shopping/merchant/reviews/v1beta
   requires_billing: true
   library_name: shopping-merchant-reviews
-# - api_shortname: showcase
-#   excluded_poms: gapic-showcase-bom
-#   name_pretty: Showcase
-#   api_description: Showcase module
-#   product_documentation: https://cloud.google.com/dummy
-#   distribution_name: com.google.cloud:gapic-showcase
-#   library_type: OTHER
-#   GAPICs:
-#   - proto_path: schema/google/showcase/v1beta1
+- api_shortname: spanner
+  name_pretty: Cloud Spanner
+  product_documentation: https://cloud.google.com/spanner/docs/
+  client_documentation: https://cloud.google.com/java/docs/reference/google-cloud-spanner/latest/history
+  api_description: is a fully managed, mission-critical,  relational database service
+    that offers transactional consistency at global scale, schemas, SQL (ANSI 2011
+    with extensions), and automatic, synchronous replication for high availability.
+    Be sure to activate the Cloud Spanner API on the Developer's Console to use Cloud
+    Spanner from your project.
+  issue_tracker: https://issuetracker.google.com/issues?q=componentid:190851%2B%20status:open
+  release_level: stable
+  language: java
+  min_java_version: 8
+  distribution_name: com.google.cloud:google-cloud-spanner
+  api_id: spanner.googleapis.com
+  transport: grpc
+  requires_billing: true
+  codeowner_team: '@googleapis/spanner-team'
+  library_type: GAPIC_COMBO
+  excluded_poms: google-cloud-spanner-bom,google-cloud-spanner
+  recommended_package: com.google.cloud.spanner
+  GAPICs:
+  - proto_path: google/spanner/admin/database/v1
+  - proto_path: google/spanner/admin/instance/v1
+  - proto_path: google/spanner/executor/v1
+  - proto_path: google/spanner/v1
 - api_shortname: spanneradapter
   name_pretty: Cloud Spanner Adapter API
   product_documentation: https://cloud.google.com/java/docs/reference/google-cloud-spanneradapter/latest/overview