Merge remote-tracking branch 'googleapis/main'

Author: diegomarquezp

.github/.OwlBot.lock.yaml

@@ -34,3 +34,7 @@ branches:
     bumpMinorPreMajor: true
     handleGHRelease: true
     branch: 6.55.x
+  - releaseType: java-backport
+    bumpMinorPreMajor: true
+    handleGHRelease: true
+    branch: 6.67.x

.github/release-please.yml

@@ -19,7 +19,6 @@ branchProtectionRules:
       - checkstyle
       - compile (8)
       - compile (11)
-      - OwlBot Post Processor
       - units-with-multiplexed-session (8)
       - units-with-multiplexed-session (11)
   - pattern: 3.3.x
@@ -141,7 +140,6 @@ branchProtectionRules:
       - checkstyle
       - compile (8)
       - compile (11)
-      - OwlBot Post Processor
 permissionRules:
   - team: yoshi-admins
     permission: admin

.github/sync-repo-settings.yaml

@@ -52,7 +52,7 @@ jobs:
     - run: .kokoro/build.sh
       env:
         JOB_TYPE: test
-        GOOGLE_CLOUD_SPANNER_ENABLE_MULTIPLEXED_SESSIONS: true
+        GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS: true
   units-java8:
     # Building using Java 17 and run the tests with Java 8 runtime
     name: "units (8)"
@@ -91,7 +91,7 @@ jobs:
       - run: .kokoro/build.sh
         env:
           JOB_TYPE: test
-          GOOGLE_CLOUD_SPANNER_ENABLE_MULTIPLEXED_SESSIONS: true
+          GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS: true
   windows:
     runs-on: windows-latest
     steps:

.github/workflows/ci.yaml

@@ -39,4 +39,4 @@ jobs:
       env:
         JOB_TYPE: test
         SPANNER_EMULATOR_HOST: localhost:9010
-        GOOGLE_CLOUD_SPANNER_ENABLE_MULTIPLEXED_SESSIONS: true
+        GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS: true

.github/workflows/integration-tests-against-emulator-with-multiplexed-session.yaml

@@ -17,6 +17,6 @@ jobs:
           # repository
           .kokoro/build.sh
       - name: Unmanaged dependency check
-        uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.30.1
+        uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.32.0
         with:
           bom-path: google-cloud-spanner-bom/pom.xml

.github/workflows/unmanaged_dependency_check.yaml

@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.30.1"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.32.0"
 }
 
 env_vars: {

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

@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.30.1"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.32.0"
 }
 
 env_vars: {

.kokoro/presubmit/graalvm-native.cfg

@@ -33,6 +33,6 @@ env_vars: {
 }
 
 env_vars: {
-    key: "GOOGLE_CLOUD_SPANNER_ENABLE_MULTIPLEXED_SESSIONS"
+    key: "GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS"
     value: "true"
-}
+}

.kokoro/presubmit/integration-multiplexed-sessions-enabled.cfg

@@ -153,8 +153,9 @@ custom_content: |
   
   #### OpenTelemetry SQL Statement Tracing
   The OpenTelemetry traces that are generated by the Java client include any request and transaction
-  tags that have been set. The traces can also include the SQL statements that are executed. Enable
-  this with the `enableExtendedTracing` option:
+  tags that have been set. The traces can also include the SQL statements that are executed and the
+  name of the thread that executes the statement. Enable this with the `enableExtendedTracing`
+  option:
   
   ```
   SpannerOptions options = SpannerOptions.newBuilder()
@@ -166,6 +167,23 @@ custom_content: |
   This option can also be enabled by setting the environment variable
   `SPANNER_ENABLE_EXTENDED_TRACING=true`.
 
+  #### OpenTelemetry API Tracing
+  You can enable tracing of each API call that the Spanner client executes with the `enableApiTracing`
+  option. These traces also include any retry attempts for an API call:
+    
+  ```
+  SpannerOptions options = SpannerOptions.newBuilder()
+  .setOpenTelemetry(openTelemetry)
+  .setEnableApiTracing(true)
+  .build();
+  ```
+    
+  This option can also be enabled by setting the environment variable
+  `SPANNER_ENABLE_API_TRACING=true`.
+  
+  > Note: The attribute keys that are used for additional information about retry attempts and the number of requests might change in a future release.
+
+
   ### Instrument with OpenCensus
 
   > Note: OpenCensus project is deprecated. See [Sunsetting OpenCensus](https://opentelemetry.io/blog/2023/sunsetting-opencensus/).
@@ -298,6 +316,38 @@ custom_content: |
 
   Spanner spanner = options.getService();
   ```
+  
+  #### OpenTelemetry SQL Statement Tracing
+  The OpenTelemetry traces that are generated by the Java client include any request and transaction
+  tags that have been set. The traces can also include the SQL statements that are executed and the
+  name of the thread that executes the statement. Enable this with the `enableExtendedTracing`
+  option:
+
+  ```
+  SpannerOptions options = SpannerOptions.newBuilder()
+    .setOpenTelemetry(openTelemetry)
+    .setEnableExtendedTracing(true)
+    .build();
+  ```
+
+  This option can also be enabled by setting the environment variable
+  `SPANNER_ENABLE_EXTENDED_TRACING=true`.
+
+  #### OpenTelemetry API Tracing
+  You can enable tracing of each API call that the Spanner client executes with the `enableApiTracing`
+  option. These traces also include any retry attempts for an API call:
+    
+  ```
+  SpannerOptions options = SpannerOptions.newBuilder()
+  .setOpenTelemetry(openTelemetry)
+  .setEnableApiTracing(true)
+  .build();
+  ```
+    
+  This option can also be enabled by setting the environment variable
+  `SPANNER_ENABLE_API_TRACING=true`.
+
+  > Note: The attribute keys that are used for additional information about retry attempts and the number of requests might change in a future release.
 
   ## Migrate from OpenCensus to OpenTelemetry
 

.readme-partials.yaml

@@ -2,21 +2,20 @@
   "api_shortname": "spanner",
   "name_pretty": "Cloud Spanner",
   "product_documentation": "https://cloud.google.com/spanner/docs/",
+  "api_description": "is a fully managed, mission-critical,  relational database service that offers transactional consistency at global scale, \\nschemas, SQL (ANSI 2011 with extensions), and automatic, synchronous replication \\nfor high availability.\\n\\nBe sure to activate the Cloud Spanner API on the Developer's Console to\\nuse Cloud Spanner from your project.",
   "client_documentation": "https://cloud.google.com/java/docs/reference/google-cloud-spanner/latest/history",
-  "api_description": "is a fully managed, mission-critical, \nrelational database service that offers transactional consistency at global scale, \nschemas, SQL (ANSI 2011 with extensions), and automatic, synchronous replication \nfor high availability.\n\nBe sure to activate the Cloud Spanner API on the Developer's Console to\nuse Cloud Spanner from your project.",
-  "issue_tracker": "https://issuetracker.google.com/issues?q=componentid:190851%2B%20status:open",
   "release_level": "stable",
+  "transport": "both",
   "language": "java",
-  "min_java_version": 8,
   "repo": "googleapis/java-spanner",
   "repo_short": "java-spanner",
   "distribution_name": "com.google.cloud:google-cloud-spanner",
   "api_id": "spanner.googleapis.com",
-  "transport": "grpc",
+  "library_type": "GAPIC_COMBO",
   "requires_billing": true,
   "codeowner_team": "@googleapis/api-spanner-java",
-  "library_type": "GAPIC_COMBO",
   "excluded_poms": "google-cloud-spanner-bom",
-  "recommended_package": "com.google.cloud.spanner"
-}
-
+  "issue_tracker": "https://issuetracker.google.com/issues?q=componentid:190851%2B%20status:open",
+  "recommended_package": "com.google.cloud.spanner",
+  "min_java_version": 8
+}

.repo-metadata.json

@@ -1,5 +1,52 @@
 # Changelog
 
+## [6.71.0](https://github.com/googleapis/java-spanner/compare/v6.70.0...v6.71.0) (2024-07-03)
+
+
+### Features
+
+* Include thread name in traces ([#3173](https://github.com/googleapis/java-spanner/issues/3173)) ([92b1e07](https://github.com/googleapis/java-spanner/commit/92b1e079e6093bc4a2e7b458c1bbe0f62a0fada9))
+* Support multiplexed sessions for RO transactions ([#3141](https://github.com/googleapis/java-spanner/issues/3141)) ([2b8e9ed](https://github.com/googleapis/java-spanner/commit/2b8e9ededc1ea1a5e8d4f90083f2cf862fcc198a))
+
+## [6.70.0](https://github.com/googleapis/java-spanner/compare/v6.69.0...v6.70.0) (2024-06-27)
+
+
+### Features
+
+* Add field order_by in spanner.proto ([#3064](https://github.com/googleapis/java-spanner/issues/3064)) ([52ee196](https://github.com/googleapis/java-spanner/commit/52ee1967ee3a37fb0482ad8b51c6e77e28b79844))
+
+
+### Bug Fixes
+
+* Do not end transaction span when rolling back to savepoint ([#3167](https://github.com/googleapis/java-spanner/issues/3167)) ([8ec0cf2](https://github.com/googleapis/java-spanner/commit/8ec0cf2032dece545c9e4d8a794b80d06550b710))
+* Remove unused DmlBatch span ([#3147](https://github.com/googleapis/java-spanner/issues/3147)) ([f7891c1](https://github.com/googleapis/java-spanner/commit/f7891c1ca42727c775cdbe91bff8d55191a3d799))
+
+
+### Dependencies
+
+* Update dependencies ([#3181](https://github.com/googleapis/java-spanner/issues/3181)) ([0c787e6](https://github.com/googleapis/java-spanner/commit/0c787e6fa67d2a259a76bbd2d7f1cfa20a1dbee8))
+* Update dependency com.google.cloud:sdk-platform-java-config to v3.32.0 ([#3184](https://github.com/googleapis/java-spanner/issues/3184)) ([9c85a6f](https://github.com/googleapis/java-spanner/commit/9c85a6fabea527253ea40a8970cc9071804d94c4))
+* Update dependency commons-cli:commons-cli to v1.8.0 ([#3073](https://github.com/googleapis/java-spanner/issues/3073)) ([36b5340](https://github.com/googleapis/java-spanner/commit/36b5340ef8bf197fbc8ed882f76caff9a6fe84b6))
+
+## [6.69.0](https://github.com/googleapis/java-spanner/compare/v6.68.1...v6.69.0) (2024-06-12)
+
+
+### Features
+
+* Add option to enable ApiTracer ([#3095](https://github.com/googleapis/java-spanner/issues/3095)) ([a0a4bc5](https://github.com/googleapis/java-spanner/commit/a0a4bc58d4269a8c1e5e76d9a0469f649bb69148))
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:sdk-platform-java-config to v3.31.0 ([#3159](https://github.com/googleapis/java-spanner/issues/3159)) ([1ee19d1](https://github.com/googleapis/java-spanner/commit/1ee19d19c2db30d79c8741cc5739de1c69fb95f9))
+
+## [6.68.1](https://github.com/googleapis/java-spanner/compare/v6.68.0...v6.68.1) (2024-05-29)
+
+
+### Bug Fixes
+
+* Make SessionPoolOptions#setUseMultiplexedSession(boolean) package private ([#3130](https://github.com/googleapis/java-spanner/issues/3130)) ([575c3e0](https://github.com/googleapis/java-spanner/commit/575c3e01541e12294dd37a622f0b1dca52d200ba))
+
 ## [6.68.0](https://github.com/googleapis/java-spanner/compare/v6.67.0...v6.68.0) (2024-05-27)
 
 

CHANGELOG.md

@@ -50,20 +50,20 @@ If you are using Maven without the BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.39.0')
+implementation platform('com.google.cloud:libraries-bom:26.43.0')
 
 implementation 'com.google.cloud:google-cloud-spanner'
 ```
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-spanner:6.67.0'
+implementation 'com.google.cloud:google-cloud-spanner:6.71.0'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-spanner" % "6.67.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-spanner" % "6.71.0"
 ```
 <!-- {x-version-update-end} -->
 
@@ -93,13 +93,7 @@ to add `google-cloud-spanner` as a dependency in your code.
 ## About Cloud Spanner
 
 
-[Cloud Spanner][product-docs] 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.
+[Cloud Spanner][product-docs] is a fully managed, mission-critical,  relational database service that offers transactional consistency at global scale, \nschemas, SQL (ANSI 2011 with extensions), and automatic, synchronous replication \nfor high availability.\n\nBe sure to activate the Cloud Spanner API on the Developer's Console to\nuse Cloud Spanner from your project.
 
 See the [Cloud Spanner client library docs][javadocs] to learn how to
 use this Cloud Spanner Client Library.
@@ -259,8 +253,9 @@ Spanner spanner = options.getService();
 
 #### OpenTelemetry SQL Statement Tracing
 The OpenTelemetry traces that are generated by the Java client include any request and transaction
-tags that have been set. The traces can also include the SQL statements that are executed. Enable
-this with the `enableExtendedTracing` option:
+tags that have been set. The traces can also include the SQL statements that are executed and the
+name of the thread that executes the statement. Enable this with the `enableExtendedTracing`
+option:
 
 ```
 SpannerOptions options = SpannerOptions.newBuilder()
@@ -272,6 +267,23 @@ SpannerOptions options = SpannerOptions.newBuilder()
 This option can also be enabled by setting the environment variable
 `SPANNER_ENABLE_EXTENDED_TRACING=true`.
 
+#### OpenTelemetry API Tracing
+You can enable tracing of each API call that the Spanner client executes with the `enableApiTracing`
+option. These traces also include any retry attempts for an API call:
+  
+```
+SpannerOptions options = SpannerOptions.newBuilder()
+.setOpenTelemetry(openTelemetry)
+.setEnableApiTracing(true)
+.build();
+```
+  
+This option can also be enabled by setting the environment variable
+`SPANNER_ENABLE_API_TRACING=true`.
+
+> Note: The attribute keys that are used for additional information about retry attempts and the number of requests might change in a future release.
+
+
 ### Instrument with OpenCensus
 
 > Note: OpenCensus project is deprecated. See [Sunsetting OpenCensus](https://opentelemetry.io/blog/2023/sunsetting-opencensus/).
@@ -405,6 +417,38 @@ SpannerOptions options = SpannerOptions.newBuilder()
 Spanner spanner = options.getService();
 ```
 
+#### OpenTelemetry SQL Statement Tracing
+The OpenTelemetry traces that are generated by the Java client include any request and transaction
+tags that have been set. The traces can also include the SQL statements that are executed and the
+name of the thread that executes the statement. Enable this with the `enableExtendedTracing`
+option:
+
+```
+SpannerOptions options = SpannerOptions.newBuilder()
+  .setOpenTelemetry(openTelemetry)
+  .setEnableExtendedTracing(true)
+  .build();
+```
+
+This option can also be enabled by setting the environment variable
+`SPANNER_ENABLE_EXTENDED_TRACING=true`.
+
+#### OpenTelemetry API Tracing
+You can enable tracing of each API call that the Spanner client executes with the `enableApiTracing`
+option. These traces also include any retry attempts for an API call:
+  
+```
+SpannerOptions options = SpannerOptions.newBuilder()
+.setOpenTelemetry(openTelemetry)
+.setEnableApiTracing(true)
+.build();
+```
+  
+This option can also be enabled by setting the environment variable
+`SPANNER_ENABLE_API_TRACING=true`.
+
+> Note: The attribute keys that are used for additional information about retry attempts and the number of requests might change in a future release.
+
 ## Migrate from OpenCensus to OpenTelemetry
 
 > Using the [OpenTelemetry OpenCensus Bridge](https://mvnrepository.com/artifact/io.opentelemetry/opentelemetry-opencensus-shim), you can immediately begin exporting your metrics and traces with OpenTelemetry
@@ -577,7 +621,7 @@ To get help, follow the instructions in the [shared Troubleshooting document][tr
 
 ## Transport
 
-Cloud Spanner uses gRPC for the transport layer.
+Cloud Spanner uses both gRPC and HTTP/JSON for the transport layer.
 
 ## Supported Java Versions
 
@@ -671,7 +715,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-spanner/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-spanner.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-spanner/6.67.0
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-spanner/6.71.0
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles