Merge branch 'main' into owl-bot-copy

googleapis · Feb 17, 2024 · 2eb64fe · 2eb64fe
2 parents ef5fabe + c580423
commit 2eb64fe
Show file tree

Hide file tree

Showing 174 changed files with 11,362 additions and 2,928 deletions.
diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
@@ -13,5 +13,5 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
-  digest: sha256:a6aa751984f1e905c3ae5a3aac78fc7b68210626ce91487dc7ff4f0a06f010cc
-# created: 2024-01-22T14:14:20.913785597Z
+  digest: sha256:1fb09a3eb66af09221da69087fd1b4d075bc7c79e508d0708f5dc0f842069da2
+# created: 2024-02-05T19:43:08.106031548Z
diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml
@@ -0,0 +1,22 @@
+on:
+  pull_request:
+name: Unmanaged dependency check
+jobs:
+  unmanaged_dependency_check:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
+        with:
+          distribution: temurin
+          java-version: 11
+      - name: Install modules
+        shell: bash
+        run: |
+          # No argument to build.sh installs the modules in local Maven
+          # repository
+          .kokoro/build.sh
+      - name: Unmanaged dependency check
+        uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@unmanaged-dependencies-check-latest
+        with:
+          bom-path: google-cloud-spanner-bom/pom.xml
diff --git a/.gitignore b/.gitignore
@@ -22,6 +22,7 @@ nosetests.xml
 .settings
 .DS_Store
 .classpath
+.tool-versions
 
 # Built documentation
 docs/

diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.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-kokoro-resources/graalvm17:22.3.3"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.25.0"
 }
 
 env_vars: {

diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-kokoro-resources/graalvm:22.3.3"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.25.0"
 }
 
 env_vars: {

diff --git a/.readme-partials.yaml b/.readme-partials.yaml
@@ -50,55 +50,133 @@ custom_content: |
   for in-depth background information about sessions and gRPC channels and how these are handled in
   the Cloud Spanner Java client.
 
-  ## OpenCensus Metrics
+  ## Metrics
 
-  Cloud Spanner client supports [Opencensus Metrics](https://opencensus.io/stats/),
-  which gives insight into the client internals and aids in debugging/troubleshooting
-  production issues. OpenCensus metrics will provide you with enough data to enable you to
-  spot, and investigate the cause of any unusual deviations from normal behavior.
-
-  All Cloud Spanner Metrics are prefixed with `cloud.google.com/java/spanner/`. The
-  metrics will be tagged with:
-  * `database`: the target database name.
-  * `instance_id`: the instance id of the target Spanner instance.
-  * `client_id`: the user defined database client id.
-  * `library_version`: the version of the library that you're using.
-
-  > Note: RPC level metrics can be gleaned from gRPC’s metrics, which are prefixed
-  with `grpc.io/client/`.
   ### Available client-side metrics:
 
-  * `cloud.google.com/java/spanner/max_in_use_sessions`: This returns the maximum
+  * `spanner/max_in_use_sessions`: This returns the maximum
     number of sessions that have been in use during the last maintenance window
     interval, so as to provide an indication of the amount of activity currently
     in the database.
 
-  * `cloud.google.com/java/spanner/max_allowed_sessions`: This shows the maximum
+  * `spanner/max_allowed_sessions`: This shows the maximum
     number of sessions allowed.
 
-  * `cloud.google.com/java/spanner/num_sessions_in_pool`: This metric allows users to
-     see instance-level and database-level data for the total number of sessions in
-     the pool at this very moment.
+  * `spanner/num_sessions_in_pool`: This metric allows users to
+    see instance-level and database-level data for the total number of sessions in
+    the pool at this very moment.
 
-  * `cloud.google.com/java/spanner/num_acquired_sessions`: This metric allows
+  * `spanner/num_acquired_sessions`: This metric allows
     users to see the total number of acquired sessions.
 
-  * `cloud.google.com/java/spanner/num_released_sessions`: This metric allows
+  * `spanner/num_released_sessions`: This metric allows
     users to see the total number of released (destroyed) sessions.
 
-  * `cloud.google.com/java/spanner/get_session_timeouts`: This gives you an
+  * `spanner/get_session_timeouts`: This gives you an
     indication of the total number of get session timed-out instead of being
     granted (the thread that requested the session is placed in a wait queue where
     it waits until a session is released into the pool by another thread) due to
     pool exhaustion since the server process started.
 
-  * `cloud.google.com/java/spanner/gfe_latency`: This metric shows latency between
+  * `spanner/gfe_latency`: This metric shows latency between
     Google's network receiving an RPC and reading back the first byte of the response.
 
-  * `cloud.google.com/java/spanner/gfe_header_missing_count`: This metric shows the
+  * `spanner/gfe_header_missing_count`: This metric shows the
     number of RPC responses received without the server-timing header, most likely
     indicating that the RPC never reached Google's network.
 
+  ### Instrument with OpenTelemetry
+
+  Cloud Spanner client supports [OpenTelemetry Metrics](https://opentelemetry.io/),
+  which gives insight into the client internals and aids in debugging/troubleshooting
+  production issues. OpenTelemetry metrics will provide you with enough data to enable you to
+  spot, and investigate the cause of any unusual deviations from normal behavior.
+
+  All Cloud Spanner Metrics are prefixed with `spanner/` and uses `cloud.google.com/java` as [Instrumentation Scope](https://opentelemetry.io/docs/concepts/instrumentation-scope/). The
+  metrics will be tagged with:
+  * `database`: the target database name.
+  * `instance_id`: the instance id of the target Spanner instance.
+  * `client_id`: the user defined database client id.
+
+  By default, the functionality is disabled. You need to add OpenTelemetry dependencies, enable OpenTelemetry metrics and must configure the OpenTelemetry with appropriate exporters at the startup of your application:
+
+  #### OpenTelemetry Dependencies
+  If you are using Maven, add this to your pom.xml file
+  ```xml
+  <dependency>
+        <groupId>io.opentelemetry</groupId>
+        <artifactId>opentelemetry-sdk</artifactId>
+        <version>{opentelemetry.version}</version>
+  </dependency>
+  <dependency>
+        <groupId>io.opentelemetry</groupId>
+        <artifactId>opentelemetry-sdk-metrics</artifactId>
+        <version>{opentelemetry.version}</version>
+  </dependency>
+  <dependency>
+      <groupId>io.opentelemetry</groupId>
+      <artifactId>opentelemetry-exporter-otlp</artifactId>
+      <version>{opentelemetry.version}</version>
+  </dependency>
+  ```
+  If you are using Gradle, add this to your dependencies
+  ```Groovy
+  compile 'io.opentelemetry:opentelemetry-sdk:{opentelemetry.version}'
+  compile 'io.opentelemetry:opentelemetry-sdk-metrics:{opentelemetry.version}'
+  compile 'io.opentelemetry:opentelemetry-exporter-oltp:{opentelemetry.version}'
+  ```
+
+  #### OpenTelemetry Configuration
+  By default, all metrics are disabled. To enable metrics and configure the OpenTelemetry follow below:
+
+  ```java
+  // Enable OpenTelemetry metrics before injecting OpenTelemetry object.
+  SpannerOptions.enableOpenTelemetryMetrics();
+
+  SdkMeterProvider sdkMeterProvider = SdkMeterProvider.builder()
+  // Use Otlp exporter or any other exporter of your choice.
+    .registerMetricReader(PeriodicMetricReader.builder(OtlpGrpcMetricExporter.builder().build())
+    .build())
+    .build();
+
+  OpenTelemetry openTelemetry = OpenTelemetrySdk.builder()
+          .setMeterProvider(sdkMeterProvider)
+          .build()
+
+  SpannerOptions options = SpannerOptions.newBuilder()
+  // Inject OpenTelemetry object via Spanner Options or register OpenTelmetry object as Global
+    .setOpenTelemetry(openTelemetry)
+    .build();
+
+  Spanner spanner = options.getService();
+  ```
+
+  ### Instrument with OpenCensus
+
+  > Note: OpenCensus project is deprecated. See [Sunsetting OpenCensus](https://opentelemetry.io/blog/2023/sunsetting-opencensus/).
+  We recommend migrating to OpenTelemetry, the successor project.
+
+  Cloud Spanner client supports [Opencensus Metrics](https://opencensus.io/stats/),
+  which gives insight into the client internals and aids in debugging/troubleshooting
+  production issues. OpenCensus metrics will provide you with enough data to enable you to
+  spot, and investigate the cause of any unusual deviations from normal behavior.
+
+  All Cloud Spanner Metrics are prefixed with `cloud.google.com/java/spanner` 
+
+  The metrics are tagged with:
+  * `database`: the target database name.
+  * `instance_id`: the instance id of the target Spanner instance.
+  * `client_id`: the user defined database client id.
+  * `library_version`: the version of the library that you're using.
+
+
+  By default, the functionality is disabled. You need to include opencensus-impl
+  dependency to collect the data and exporter dependency to export to backend.
+
+  [Click here](https://medium.com/google-cloud/troubleshooting-cloud-spanner-applications-with-opencensus-2cf424c4c590) for more information.
+
+  #### OpenCensus Dependencies
+
   If you are using Maven, add this to your pom.xml file
   ```xml
   <dependency>
@@ -119,6 +197,8 @@ custom_content: |
   compile 'io.opencensus:opencensus-exporter-stats-stackdriver:0.30.0'
   ```
 
+  #### Configure the OpenCensus Exporter
+
   At the start of your application configure the exporter:
 
   ```java
@@ -130,9 +210,107 @@ custom_content: |
   // The minimum reporting period for Stackdriver is 1 minute.
   StackdriverStatsExporter.createAndRegister();
   ```
+  #### Enable RPC Views
 
-  By default, the functionality is disabled. You need to include opencensus-impl
-  dependency to collect the data and exporter dependency to export to backend.
+  By default, all session metrics are enabled. To enable RPC views, use either of the following method:
 
-  [Click here](https://medium.com/google-cloud/troubleshooting-cloud-spanner-applications-with-opencensus-2cf424c4c590) for more information.
+  ```java
+  // Register views for GFE metrics, including gfe_latency and gfe_header_missing_count.
+  SpannerRpcViews.registerGfeLatencyAndHeaderMissingCountViews();
+
+  // Register GFE Latency view. 
+  SpannerRpcViews.registerGfeLatencyView();
+
+  // Register GFE Header Missing Count view.
+  SpannerRpcViews.registerGfeHeaderMissingCountView();
+  ```
+
+  ## Traces
+  Cloud Spanner client supports OpenTelemetry Traces, which gives insight into the client internals and aids in debugging/troubleshooting production issues. 
+
+  By default, the functionality is disabled. You need to add OpenTelemetry dependencies, enable OpenTelemetry traces and must configure the OpenTelemetry with appropriate exporters at the startup of your application.
+
+  #### OpenTelemetry Dependencies
+
+  If you are using Maven, add this to your pom.xml file
+  ```xml
+  <dependency>
+        <groupId>io.opentelemetry</groupId>
+        <artifactId>opentelemetry-sdk</artifactId>
+        <version>{opentelemetry.version}</version>
+  </dependency>
+  <dependency>
+        <groupId>io.opentelemetry</groupId>
+        <artifactId>opentelemetry-sdk-trace</artifactId>
+        <version>{opentelemetry.version}</version>
+  </dependency>
+  <dependency>
+      <groupId>io.opentelemetry</groupId>
+      <artifactId>opentelemetry-exporter-otlp</artifactId>
+      <version>{opentelemetry.version}</version>
+  </dependency>
+  ```
+  If you are using Gradle, add this to your dependencies
+  ```Groovy
+  compile 'io.opentelemetry:opentelemetry-sdk:{opentelemetry.version}'
+  compile 'io.opentelemetry:opentelemetry-sdk-trace:{opentelemetry.version}'
+  compile 'io.opentelemetry:opentelemetry-exporter-oltp:{opentelemetry.version}'
+  ```
+  #### OpenTelemetry Configuration
+
+  > Note: Enabling OpenTelemetry traces will automatically disable OpenCensus traces.
+
+  ```java
+  // Enable OpenTelemetry traces
+  SpannerOptions.enableOpenTelemetryTraces();
+
+  // Create a new tracer provider
+  SdkTracerProvider sdkTracerProvider = SdkTracerProvider.builder()
+        // Use Otlp exporter or any other exporter of your choice.
+        .addSpanProcessor(SimpleSpanProcessor.builder(OtlpGrpcSpanExporter
+            .builder().build()).build())
+            .build();
+
+
+  OpenTelemetry openTelemetry = OpenTelemetrySdk.builder()
+          .setTracerProvider(sdkTracerProvider)
+          .build()
+
+  SpannerOptions options = SpannerOptions.newBuilder()
+  // Inject OpenTelemetry object via Spanner Options or register OpenTelmetry object as Global
+    .setOpenTelemetry(openTelemetry)
+    .build();
+
+  Spanner spanner = options.getService();
+  ```
+
+  ## 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
+
+  #### Disable OpenCensus metrics
+  Disable OpenCensus metrics for Spanner by including the following code if you still possess OpenCensus dependencies and exporter.
+
+  ```java
+  SpannerOptions.disableOpenCensusMetrics();
+  ```
+
+  #### Disable OpenCensus traces
+  Enabling OpenTelemetry traces for Spanner will automatically disable OpenCensus traces.
+
+  ```java
+  SpannerOptions.enableOpenTelemetryTraces();
+  ```
+
+  #### Remove OpenCensus Dependencies and Code
+  Remove any OpenCensus-related code and dependencies from your codebase if all your dependencies are ready to move to OpenTelemetry.
+
+  * Remove the OpenCensus Exporters which were configured [here](#configure-the-opencensus-exporter)
+  * Remove SpannerRPCViews reference which were configured [here](#enable-rpc-views)
+  * Remove the OpenCensus dependencies which were added [here](#opencensus-dependencies)
+
+  #### Update your Dashboards and Alerts
 
+  Update your dashboards and alerts to reflect below changes
+  * **Metrics name** : `cloud.google.com/java` prefix has been removed from OpenTelemery metrics and instead has been added as Instrumenation Scope.
+  * **Metrics namespace** : OpenTelmetry exporters uses `workload.googleapis.com` namespace opposed to `custom.googleapis.com` with OpenCensus. 
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,44 @@
 # Changelog
 
+## [6.59.0](https://github.com/googleapis/java-spanner/compare/v6.58.0...v6.59.0) (2024-02-15)
+
+
+### Features
+
+* Support public methods to use autogenerated admin clients. ([#2878](https://github.com/googleapis/java-spanner/issues/2878)) ([53bcb3e](https://github.com/googleapis/java-spanner/commit/53bcb3eca2e814472c3def24e8e03d47652a8e42))
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:sdk-platform-java-config to v3.25.0 ([#2888](https://github.com/googleapis/java-spanner/issues/2888)) ([8e2da51](https://github.com/googleapis/java-spanner/commit/8e2da5126263c7acd134fb7fcfeb590ca190ce8e))
+
+
+### Documentation
+
+* README for OpenTelemetry metrics and traces ([#2880](https://github.com/googleapis/java-spanner/issues/2880)) ([c8632f5](https://github.com/googleapis/java-spanner/commit/c8632f5b2f462420a8c2a1f4308a68a18a414472))
+* Samples and tests for database Admin APIs. ([#2775](https://github.com/googleapis/java-spanner/issues/2775)) ([14ae01c](https://github.com/googleapis/java-spanner/commit/14ae01cd82e455a0dc22d7e3bb8c362e541ede12))
+
+## [6.58.0](https://github.com/googleapis/java-spanner/compare/v6.57.0...v6.58.0) (2024-02-08)
+
+
+### Features
+
+* Open telemetry implementation ([#2770](https://github.com/googleapis/java-spanner/issues/2770)) ([244d6a8](https://github.com/googleapis/java-spanner/commit/244d6a836795bf07dacd6b766436dbd6bf5fa912))
+* **spanner:** Support max_commit_delay in Spanner transactions ([#2854](https://github.com/googleapis/java-spanner/issues/2854)) ([e2b7ae6](https://github.com/googleapis/java-spanner/commit/e2b7ae66648ea775c18c71ab353edd6c0f50e7ac))
+* Support Directed Read in Connection API ([#2855](https://github.com/googleapis/java-spanner/issues/2855)) ([ee477c2](https://github.com/googleapis/java-spanner/commit/ee477c2e7c509ce4b7c43da3b68c1433c59e46fb))
+
+
+### Bug Fixes
+
+* Cast for Proto type ([#2862](https://github.com/googleapis/java-spanner/issues/2862)) ([0a95dba](https://github.com/googleapis/java-spanner/commit/0a95dba47681c9c4cc4e41ecfb5dadec6357bff6))
+* Ignore UnsupportedOperationException for virtual threads ([#2866](https://github.com/googleapis/java-spanner/issues/2866)) ([aa9ad7f](https://github.com/googleapis/java-spanner/commit/aa9ad7f5a5e2405e8082a542916c3d1fa7d0fa25))
+* Use default query options with statement cache ([#2860](https://github.com/googleapis/java-spanner/issues/2860)) ([741e4cf](https://github.com/googleapis/java-spanner/commit/741e4cf4eb51c4635078cfe2c52b7462bd4cbbd8))
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.24.0 ([#2856](https://github.com/googleapis/java-spanner/issues/2856)) ([968877e](https://github.com/googleapis/java-spanner/commit/968877e4eff7da3ff27180c2a6129b04922d1af4))
+
 ## [6.57.0](https://github.com/googleapis/java-spanner/compare/v6.56.0...v6.57.0) (2024-01-29)