diff --git a/CHANGELOG.md b/CHANGELOG.md index 56c6a723be26..fa3f29673a3f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [2.58.1](https://github.com/googleapis/java-bigtable/compare/v2.58.0...v2.58.1) (2025-04-28) + + +### Bug Fixes + +* Close otel instance ([#2571](https://github.com/googleapis/java-bigtable/issues/2571)) ([422fe26](https://github.com/googleapis/java-bigtable/commit/422fe26f3aae30fe74de80fad3848707452d6646)) + ## [2.58.0](https://github.com/googleapis/java-bigtable/compare/v2.57.3...v2.58.0) (2025-04-28) diff --git a/README.md b/README.md index 237a656185ab..b96655095ab3 100644 --- a/README.md +++ b/README.md @@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-bigtable' If you are using Gradle without BOM, add this to your dependencies: ```Groovy -implementation 'com.google.cloud:google-cloud-bigtable:2.58.0' +implementation 'com.google.cloud:google-cloud-bigtable:2.58.1' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-bigtable" % "2.58.0" +libraryDependencies += "com.google.cloud" % "google-cloud-bigtable" % "2.58.1" ``` ## Authentication @@ -470,7 +470,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-bigtable/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-bigtable.svg -[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-bigtable/2.58.0 +[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-bigtable/2.58.1 [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 diff --git a/google-cloud-bigtable-bom/pom.xml b/google-cloud-bigtable-bom/pom.xml index 054b19fb2cea..af977ec21a46 100644 --- a/google-cloud-bigtable-bom/pom.xml +++ b/google-cloud-bigtable-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-bigtable-bom - 2.58.0 + 2.58.1 pom com.google.cloud @@ -63,37 +63,37 @@ com.google.cloud google-cloud-bigtable - 2.58.0 + 2.58.1 com.google.cloud google-cloud-bigtable-emulator - 0.195.0 + 0.195.1 com.google.cloud google-cloud-bigtable-emulator-core - 0.195.0 + 0.195.1 com.google.api.grpc grpc-google-cloud-bigtable-admin-v2 - 2.58.0 + 2.58.1 com.google.api.grpc grpc-google-cloud-bigtable-v2 - 2.58.0 + 2.58.1 com.google.api.grpc proto-google-cloud-bigtable-admin-v2 - 2.58.0 + 2.58.1 com.google.api.grpc proto-google-cloud-bigtable-v2 - 2.58.0 + 2.58.1 diff --git a/google-cloud-bigtable-deps-bom/pom.xml b/google-cloud-bigtable-deps-bom/pom.xml index 014afcda4560..100a899e16dc 100644 --- a/google-cloud-bigtable-deps-bom/pom.xml +++ b/google-cloud-bigtable-deps-bom/pom.xml @@ -13,7 +13,7 @@ com.google.cloud google-cloud-bigtable-deps-bom - 2.58.0 + 2.58.1 pom diff --git a/google-cloud-bigtable-emulator-core/pom.xml b/google-cloud-bigtable-emulator-core/pom.xml index 7c2afa49b600..db70bdf45b4f 100644 --- a/google-cloud-bigtable-emulator-core/pom.xml +++ b/google-cloud-bigtable-emulator-core/pom.xml @@ -7,11 +7,11 @@ google-cloud-bigtable-parent com.google.cloud - 2.58.0 + 2.58.1 google-cloud-bigtable-emulator-core - 0.195.0 + 0.195.1 A Java wrapper for the Cloud Bigtable emulator. diff --git a/google-cloud-bigtable-emulator/pom.xml b/google-cloud-bigtable-emulator/pom.xml index 8bd0cc5b7c93..496434abdf44 100644 --- a/google-cloud-bigtable-emulator/pom.xml +++ b/google-cloud-bigtable-emulator/pom.xml @@ -5,7 +5,7 @@ 4.0.0 google-cloud-bigtable-emulator - 0.195.0 + 0.195.1 Google Cloud Java - Bigtable Emulator https://github.com/googleapis/java-bigtable @@ -14,7 +14,7 @@ com.google.cloud google-cloud-bigtable-parent - 2.58.0 + 2.58.1 scm:git:git@github.com:googleapis/java-bigtable.git @@ -81,14 +81,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 2.58.0 + 2.58.1 pom import com.google.cloud google-cloud-bigtable-bom - 2.58.0 + 2.58.1 pom import @@ -99,7 +99,7 @@ com.google.cloud google-cloud-bigtable-emulator-core - 0.195.0 + 0.195.1 diff --git a/google-cloud-bigtable/pom.xml b/google-cloud-bigtable/pom.xml index 64357d03fb5d..293e0f8b7f0e 100644 --- a/google-cloud-bigtable/pom.xml +++ b/google-cloud-bigtable/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-bigtable - 2.58.0 + 2.58.1 jar Google Cloud Bigtable https://github.com/googleapis/java-bigtable @@ -12,11 +12,11 @@ com.google.cloud google-cloud-bigtable-parent - 2.58.0 + 2.58.1 - 2.58.0 + 2.58.1 google-cloud-bigtable @@ -52,14 +52,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 2.58.0 + 2.58.1 pom import com.google.cloud google-cloud-bigtable-bom - 2.58.0 + 2.58.1 pom import diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java index e5581730a1d0..9c8f4f1639b9 100644 --- a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java +++ b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java @@ -20,6 +20,6 @@ @InternalApi("For internal use only") public final class Version { // {x-version-update-start:google-cloud-bigtable:current} - public static String VERSION = "2.58.0"; + public static String VERSION = "2.58.1"; // {x-version-update-end} } diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/BigtableClientContext.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/BigtableClientContext.java index bc3660e7c69e..778492127647 100644 --- a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/BigtableClientContext.java +++ b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/BigtableClientContext.java @@ -54,6 +54,7 @@ public class BigtableClientContext { @Nullable private final OpenTelemetry openTelemetry; @Nullable private final OpenTelemetrySdk internalOpenTelemetry; + private final MetricsProvider metricsProvider; private final ClientContext clientContext; public static BigtableClientContext create(EnhancedBigtableStubSettings settings) @@ -140,7 +141,8 @@ public static BigtableClientContext create(EnhancedBigtableStubSettings settings clientContext.getExecutor()); } - return new BigtableClientContext(clientContext, openTelemetry, internalOtel); + return new BigtableClientContext( + clientContext, openTelemetry, internalOtel, settings.getMetricsProvider()); } private static void configureGrpcOtel( @@ -172,11 +174,13 @@ private static void configureGrpcOtel( private BigtableClientContext( ClientContext clientContext, - OpenTelemetry openTelemetry, - @Nullable OpenTelemetrySdk internalOtel) { + @Nullable OpenTelemetry openTelemetry, + @Nullable OpenTelemetrySdk internalOtel, + MetricsProvider metricsProvider) { this.clientContext = clientContext; this.openTelemetry = openTelemetry; this.internalOpenTelemetry = internalOtel; + this.metricsProvider = metricsProvider; } public OpenTelemetry getOpenTelemetry() { @@ -194,6 +198,9 @@ public void close() throws Exception { if (internalOpenTelemetry != null) { internalOpenTelemetry.close(); } + if (metricsProvider instanceof DefaultMetricsProvider && openTelemetry != null) { + ((OpenTelemetrySdk) openTelemetry).close(); + } } private static OpenTelemetry getOpenTelemetryFromMetricsProvider( diff --git a/grpc-google-cloud-bigtable-admin-v2/pom.xml b/grpc-google-cloud-bigtable-admin-v2/pom.xml index 2b99d93da6da..1613409970d4 100644 --- a/grpc-google-cloud-bigtable-admin-v2/pom.xml +++ b/grpc-google-cloud-bigtable-admin-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-bigtable-admin-v2 - 2.58.0 + 2.58.1 grpc-google-cloud-bigtable-admin-v2 GRPC library for grpc-google-cloud-bigtable-admin-v2 com.google.cloud google-cloud-bigtable-parent - 2.58.0 + 2.58.1 @@ -18,14 +18,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 2.58.0 + 2.58.1 pom import com.google.cloud google-cloud-bigtable-bom - 2.58.0 + 2.58.1 pom import diff --git a/grpc-google-cloud-bigtable-v2/pom.xml b/grpc-google-cloud-bigtable-v2/pom.xml index 463190f6859d..0babf6554f41 100644 --- a/grpc-google-cloud-bigtable-v2/pom.xml +++ b/grpc-google-cloud-bigtable-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-bigtable-v2 - 2.58.0 + 2.58.1 grpc-google-cloud-bigtable-v2 GRPC library for grpc-google-cloud-bigtable-v2 com.google.cloud google-cloud-bigtable-parent - 2.58.0 + 2.58.1 @@ -18,14 +18,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 2.58.0 + 2.58.1 pom import com.google.cloud google-cloud-bigtable-bom - 2.58.0 + 2.58.1 pom import diff --git a/pom.xml b/pom.xml index c69af0f1ec05..b31502250db6 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ google-cloud-bigtable-parent pom - 2.58.0 + 2.58.1 Google Cloud Bigtable Parent https://github.com/googleapis/java-bigtable @@ -153,27 +153,27 @@ com.google.api.grpc proto-google-cloud-bigtable-v2 - 2.58.0 + 2.58.1 com.google.api.grpc proto-google-cloud-bigtable-admin-v2 - 2.58.0 + 2.58.1 com.google.api.grpc grpc-google-cloud-bigtable-v2 - 2.58.0 + 2.58.1 com.google.api.grpc grpc-google-cloud-bigtable-admin-v2 - 2.58.0 + 2.58.1 com.google.cloud google-cloud-bigtable - 2.58.0 + 2.58.1 diff --git a/proto-google-cloud-bigtable-admin-v2/pom.xml b/proto-google-cloud-bigtable-admin-v2/pom.xml index 3337bf2b69b2..e8ceaf603d79 100644 --- a/proto-google-cloud-bigtable-admin-v2/pom.xml +++ b/proto-google-cloud-bigtable-admin-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-bigtable-admin-v2 - 2.58.0 + 2.58.1 proto-google-cloud-bigtable-admin-v2 PROTO library for proto-google-cloud-bigtable-admin-v2 com.google.cloud google-cloud-bigtable-parent - 2.58.0 + 2.58.1 @@ -18,14 +18,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 2.58.0 + 2.58.1 pom import com.google.cloud google-cloud-bigtable-bom - 2.58.0 + 2.58.1 pom import diff --git a/proto-google-cloud-bigtable-v2/pom.xml b/proto-google-cloud-bigtable-v2/pom.xml index 6d8e46dd213a..0677bb9dd581 100644 --- a/proto-google-cloud-bigtable-v2/pom.xml +++ b/proto-google-cloud-bigtable-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-bigtable-v2 - 2.58.0 + 2.58.1 proto-google-cloud-bigtable-v2 PROTO library for proto-google-cloud-bigtable-v2 com.google.cloud google-cloud-bigtable-parent - 2.58.0 + 2.58.1 @@ -18,14 +18,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 2.58.0 + 2.58.1 pom import com.google.cloud google-cloud-bigtable-bom - 2.58.0 + 2.58.1 pom import diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index eb685ba374e7..9b0b2b1182f6 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-bigtable - 2.58.0 + 2.58.1 diff --git a/test-proxy/pom.xml b/test-proxy/pom.xml index 7ecfa36cf776..358e4bc11412 100644 --- a/test-proxy/pom.xml +++ b/test-proxy/pom.xml @@ -12,11 +12,11 @@ google-cloud-bigtable-parent com.google.cloud - 2.58.0 + 2.58.1 - 2.58.0 + 2.58.1 diff --git a/versions.txt b/versions.txt index 60c4ad7bfdd4..12b7e3e5530d 100644 --- a/versions.txt +++ b/versions.txt @@ -1,10 +1,10 @@ # Format: # module:released-version:current-version -google-cloud-bigtable:2.58.0:2.58.0 -grpc-google-cloud-bigtable-admin-v2:2.58.0:2.58.0 -grpc-google-cloud-bigtable-v2:2.58.0:2.58.0 -proto-google-cloud-bigtable-admin-v2:2.58.0:2.58.0 -proto-google-cloud-bigtable-v2:2.58.0:2.58.0 -google-cloud-bigtable-emulator:0.195.0:0.195.0 -google-cloud-bigtable-emulator-core:0.195.0:0.195.0 +google-cloud-bigtable:2.58.1:2.58.1 +grpc-google-cloud-bigtable-admin-v2:2.58.1:2.58.1 +grpc-google-cloud-bigtable-v2:2.58.1:2.58.1 +proto-google-cloud-bigtable-admin-v2:2.58.1:2.58.1 +proto-google-cloud-bigtable-v2:2.58.1:2.58.1 +google-cloud-bigtable-emulator:0.195.1:0.195.1 +google-cloud-bigtable-emulator-core:0.195.1:0.195.1