From 509e772b2dd23a9204ab433d588b99d4cef3ce2c Mon Sep 17 00:00:00 2001 From: Mattie Fu Date: Thu, 18 Aug 2022 09:23:06 -0400 Subject: [PATCH 01/11] test: add integration test for builtin metrics --- google-cloud-bigtable-bom/pom.xml | 1 + google-cloud-bigtable-deps-bom/pom.xml | 1 + google-cloud-bigtable/pom.xml | 4 +- .../bigtable/data/v2/it/BuiltinMetricsIT.java | 116 ++++++++++++++++++ pom.xml | 18 ++- 5 files changed, 137 insertions(+), 3 deletions(-) create mode 100644 google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/BuiltinMetricsIT.java diff --git a/google-cloud-bigtable-bom/pom.xml b/google-cloud-bigtable-bom/pom.xml index 8dd219c4d7a9..daaf927cf123 100644 --- a/google-cloud-bigtable-bom/pom.xml +++ b/google-cloud-bigtable-bom/pom.xml @@ -9,6 +9,7 @@ com.google.cloud google-cloud-shared-config 1.5.1 + Google Cloud Bigtable BOM diff --git a/google-cloud-bigtable-deps-bom/pom.xml b/google-cloud-bigtable-deps-bom/pom.xml index a3a90f94db0f..52d87d441a9a 100644 --- a/google-cloud-bigtable-deps-bom/pom.xml +++ b/google-cloud-bigtable-deps-bom/pom.xml @@ -8,6 +8,7 @@ com.google.cloud google-cloud-shared-config 1.5.1 + com.google.cloud diff --git a/google-cloud-bigtable/pom.xml b/google-cloud-bigtable/pom.xml index d565f746de1c..9e00c9a6990d 100644 --- a/google-cloud-bigtable/pom.xml +++ b/google-cloud-bigtable/pom.xml @@ -60,11 +60,11 @@ - com.google.cloud google-cloud-bigtable-stats - + io.opencensus diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/BuiltinMetricsIT.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/BuiltinMetricsIT.java new file mode 100644 index 000000000000..b5c81f41da0f --- /dev/null +++ b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/BuiltinMetricsIT.java @@ -0,0 +1,116 @@ +package com.google.cloud.bigtable.data.v2.it; + +import static com.google.common.truth.TruthJUnit.assume; + +import com.google.api.client.util.Lists; +import com.google.cloud.bigtable.data.v2.BigtableDataSettings; +import com.google.cloud.bigtable.data.v2.models.Query; +import com.google.cloud.bigtable.data.v2.models.Row; +import com.google.cloud.bigtable.data.v2.models.RowMutation; +import com.google.cloud.bigtable.test_helpers.env.EmulatorEnv; +import com.google.cloud.bigtable.test_helpers.env.TestEnvRule; +import com.google.cloud.monitoring.v3.MetricServiceClient; +import com.google.common.truth.Truth; +import com.google.monitoring.v3.ListTimeSeriesRequest; +import com.google.monitoring.v3.ListTimeSeriesResponse; +import com.google.monitoring.v3.ProjectName; +import com.google.monitoring.v3.TimeInterval; +import com.google.protobuf.util.Timestamps; +import java.io.IOException; +import java.util.ArrayList; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.ClassRule; +import org.junit.Test; + +public class BuiltinMetricsIT { + @ClassRule public static TestEnvRule testEnvRule = new TestEnvRule(); + public static MetricServiceClient metricClient; + + public static String[] VIEWS = { + "operation_latencies", + "retry_count", + "attempt_latencies", + "server_latencies", + "connectivity_error_count", + "application_latencies" + }; + + @BeforeClass + public static void setUpClass() throws IOException { + assume() + .withMessage("Builtin metrics integration test is not supported by emulator") + .that(testEnvRule.env()) + .isNotInstanceOf(EmulatorEnv.class); + + // Enable built in metrics + BigtableDataSettings.enableBuiltinMetrics(); + + // Create a cloud monitoring client + metricClient = MetricServiceClient.create(); + } + + @Test + public void testBuiltinMetrics() throws Exception { + // Send a MutateRow and ReadRows request + testEnvRule + .env() + .getDataClient() + .mutateRow( + RowMutation.create(testEnvRule.env().getTableId(), "a-new-key") + .setCell(testEnvRule.env().getFamilyId(), "q", "abc")); + ArrayList rows = + Lists.newArrayList( + testEnvRule + .env() + .getDataClient() + .readRows(Query.create(testEnvRule.env().getTableId()).limit(10))); + + // Sleep 5 minutes so the metrics could be published and precomputation is done + Thread.sleep(60 * 5 * 1000); + + ProjectName name = ProjectName.of(testEnvRule.env().getProjectId()); + + // Restrict time to last 10 minutes + long startMillis = System.currentTimeMillis() - ((60 * 10) * 1000); + TimeInterval interval = + TimeInterval.newBuilder() + .setStartTime(Timestamps.fromMillis(startMillis)) + .setEndTime(Timestamps.fromMillis(System.currentTimeMillis())) + .build(); + + for (String view : VIEWS) { + // Filter on instance and method name + // Verify that metrics are published for MutateRow request + String metricFilter = + String.format( + "metric.type=\"bigtable.googleapis.com/client/%s\" " + + "AND resource.labels.instance=\"%s\" AND metric.labels.method=\"Bigtable.MutateRow\"", + view, testEnvRule.env().getInstanceId()); + ListTimeSeriesRequest.Builder requestBuilder = + ListTimeSeriesRequest.newBuilder() + .setName(name.toString()) + .setFilter(metricFilter) + .setInterval(interval) + .setView(ListTimeSeriesRequest.TimeSeriesView.FULL); + ListTimeSeriesResponse response = + metricClient.listTimeSeriesCallable().call(requestBuilder.build()); + Truth.assertThat(response.getTimeSeriesCount()).isGreaterThan(0); + + // Verify that metrics are published for ReadRows request + metricFilter = + String.format( + "metric.type=\"bigtable.googleapis.com/client/operation_latencies\" " + + "AND resource.labels.instance=\"%s\" AND metric.labels.method=\"Bigtable.ReadRows\"", + testEnvRule.env().getInstanceId()); + requestBuilder.setFilter(metricFilter); + response = metricClient.listTimeSeriesCallable().call(requestBuilder.build()); + Truth.assertThat(response.getTimeSeriesCount()).isGreaterThan(0); + } + } + + @AfterClass + public static void tearDown() { + metricClient.close(); + } +} diff --git a/pom.xml b/pom.xml index b4d3e20b294e..88ca1199c540 100644 --- a/pom.xml +++ b/pom.xml @@ -15,6 +15,7 @@ com.google.cloud google-cloud-shared-config 1.5.3 + @@ -339,6 +340,22 @@ + + + + with-shaded + + + !skip-shaded + + + + google-cloud-bigtable-stats + + @@ -347,7 +364,6 @@ grpc-google-cloud-bigtable-v2 proto-google-cloud-bigtable-admin-v2 proto-google-cloud-bigtable-v2 - google-cloud-bigtable-stats google-cloud-bigtable-emulator-core google-cloud-bigtable-emulator google-cloud-bigtable-bom From 47521301260286211d0e6a0a9f21f24fc185af34 Mon Sep 17 00:00:00 2001 From: Mattie Fu Date: Thu, 18 Aug 2022 09:35:06 -0400 Subject: [PATCH 02/11] add license --- .../bigtable/data/v2/it/BuiltinMetricsIT.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/BuiltinMetricsIT.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/BuiltinMetricsIT.java index b5c81f41da0f..b615e522bed8 100644 --- a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/BuiltinMetricsIT.java +++ b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/BuiltinMetricsIT.java @@ -1,3 +1,18 @@ +/* + * 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 + * + * https://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. + */ package com.google.cloud.bigtable.data.v2.it; import static com.google.common.truth.TruthJUnit.assume; From edd4102e8aa34d4198ae3de1beb72754c7697016 Mon Sep 17 00:00:00 2001 From: Mattie Fu Date: Fri, 19 Aug 2022 11:24:07 -0400 Subject: [PATCH 03/11] test on staging --- .../google/cloud/bigtable/data/v2/it/BuiltinMetricsIT.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/BuiltinMetricsIT.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/BuiltinMetricsIT.java index b615e522bed8..58df1d131b86 100644 --- a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/BuiltinMetricsIT.java +++ b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/BuiltinMetricsIT.java @@ -25,6 +25,7 @@ import com.google.cloud.bigtable.test_helpers.env.EmulatorEnv; import com.google.cloud.bigtable.test_helpers.env.TestEnvRule; import com.google.cloud.monitoring.v3.MetricServiceClient; +import com.google.cloud.monitoring.v3.MetricServiceSettings; import com.google.common.truth.Truth; import com.google.monitoring.v3.ListTimeSeriesRequest; import com.google.monitoring.v3.ListTimeSeriesResponse; @@ -61,8 +62,12 @@ public static void setUpClass() throws IOException { // Enable built in metrics BigtableDataSettings.enableBuiltinMetrics(); + MetricServiceSettings settings = + MetricServiceSettings.newBuilder() + .setEndpoint("staging-monitoring.sandbox.googleapis.com:443") + .build(); // Create a cloud monitoring client - metricClient = MetricServiceClient.create(); + metricClient = MetricServiceClient.create(settings); } @Test From c33e6db1bccb99273618dd4f01d36409d8e7f9ac Mon Sep 17 00:00:00 2001 From: Mattie Fu Date: Fri, 19 Aug 2022 12:49:51 -0400 Subject: [PATCH 04/11] udpate --- .../BigtableCreateTimeSeriesExporter.java | 7 +++- google-cloud-bigtable/pom.xml | 32 +++++++++++++++++-- .../bigtable/data/v2/it/BuiltinMetricsIT.java | 26 +++++++++------ 3 files changed, 52 insertions(+), 13 deletions(-) diff --git a/google-cloud-bigtable-stats/src/main/java/com/google/cloud/bigtable/stats/BigtableCreateTimeSeriesExporter.java b/google-cloud-bigtable-stats/src/main/java/com/google/cloud/bigtable/stats/BigtableCreateTimeSeriesExporter.java index ad2e76867cef..5ae9162c13aa 100644 --- a/google-cloud-bigtable-stats/src/main/java/com/google/cloud/bigtable/stats/BigtableCreateTimeSeriesExporter.java +++ b/google-cloud-bigtable-stats/src/main/java/com/google/cloud/bigtable/stats/BigtableCreateTimeSeriesExporter.java @@ -16,6 +16,7 @@ package com.google.cloud.bigtable.stats; import com.google.api.MonitoredResource; +import com.google.api.gax.grpc.GrpcResponseMetadata; import com.google.cloud.monitoring.v3.MetricServiceClient; import com.google.monitoring.v3.CreateTimeSeriesRequest; import com.google.monitoring.v3.ProjectName; @@ -72,12 +73,16 @@ public void export(Collection metrics) { for (Map.Entry> entry : projectToTimeSeries.entrySet()) { ProjectName projectName = ProjectName.of(entry.getKey()); + GrpcResponseMetadata metadata = new GrpcResponseMetadata(); CreateTimeSeriesRequest request = CreateTimeSeriesRequest.newBuilder() .setName(projectName.toString()) .addAllTimeSeries(entry.getValue()) .build(); - this.metricServiceClient.createServiceTimeSeries(request); + this.metricServiceClient + .createTimeSeriesCallable() + .call(request, metadata.createContextWithHandlers()); + // this.metricServiceClient.createServiceTimeSeries(request); } } catch (Throwable e) { logger.log(Level.WARNING, "Exception thrown when exporting TimeSeries.", e); diff --git a/google-cloud-bigtable/pom.xml b/google-cloud-bigtable/pom.xml index 9e00c9a6990d..1be4f681448c 100644 --- a/google-cloud-bigtable/pom.xml +++ b/google-cloud-bigtable/pom.xml @@ -54,6 +54,14 @@ pom import + + com.google.cloud + google-cloud-monitoring-bom + 3.4.1 + pom + import + + @@ -63,8 +71,9 @@ com.google.cloud google-cloud-bigtable-stats - + io.opencensus @@ -254,6 +263,16 @@ + + com.google.cloud + google-cloud-monitoring + test + + + com.google.api.grpc + proto-google-cloud-monitoring-v3 + test + com.google.truth truth @@ -645,7 +664,16 @@ io.grpc:grpc-auth,io.grpc:grpc-grpclb io.opencensus:opencensus-impl-core + + + + + + + + + diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/BuiltinMetricsIT.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/BuiltinMetricsIT.java index 58df1d131b86..b4a21e3084c2 100644 --- a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/BuiltinMetricsIT.java +++ b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/BuiltinMetricsIT.java @@ -16,6 +16,7 @@ package com.google.cloud.bigtable.data.v2.it; import static com.google.common.truth.TruthJUnit.assume; +import static com.google.common.truth.Truth.assertThat; import com.google.api.client.util.Lists; import com.google.cloud.bigtable.data.v2.BigtableDataSettings; @@ -26,19 +27,24 @@ import com.google.cloud.bigtable.test_helpers.env.TestEnvRule; import com.google.cloud.monitoring.v3.MetricServiceClient; import com.google.cloud.monitoring.v3.MetricServiceSettings; -import com.google.common.truth.Truth; import com.google.monitoring.v3.ListTimeSeriesRequest; import com.google.monitoring.v3.ListTimeSeriesResponse; import com.google.monitoring.v3.ProjectName; import com.google.monitoring.v3.TimeInterval; import com.google.protobuf.util.Timestamps; import java.io.IOException; +import java.time.Duration; import java.util.ArrayList; +import java.util.concurrent.TimeUnit; + import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.ClassRule; import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; +@RunWith(JUnit4.class) public class BuiltinMetricsIT { @ClassRule public static TestEnvRule testEnvRule = new TestEnvRule(); public static MetricServiceClient metricClient; @@ -70,6 +76,11 @@ public static void setUpClass() throws IOException { metricClient = MetricServiceClient.create(settings); } + @AfterClass + public static void tearDown() { + metricClient.close(); + } + @Test public void testBuiltinMetrics() throws Exception { // Send a MutateRow and ReadRows request @@ -87,12 +98,12 @@ public void testBuiltinMetrics() throws Exception { .readRows(Query.create(testEnvRule.env().getTableId()).limit(10))); // Sleep 5 minutes so the metrics could be published and precomputation is done - Thread.sleep(60 * 5 * 1000); + Thread.sleep(Duration.ofMinutes(5).toMillis()); ProjectName name = ProjectName.of(testEnvRule.env().getProjectId()); // Restrict time to last 10 minutes - long startMillis = System.currentTimeMillis() - ((60 * 10) * 1000); + long startMillis = System.currentTimeMillis() - Duration.ofMinutes (10).toMillis(); TimeInterval interval = TimeInterval.newBuilder() .setStartTime(Timestamps.fromMillis(startMillis)) @@ -115,7 +126,7 @@ public void testBuiltinMetrics() throws Exception { .setView(ListTimeSeriesRequest.TimeSeriesView.FULL); ListTimeSeriesResponse response = metricClient.listTimeSeriesCallable().call(requestBuilder.build()); - Truth.assertThat(response.getTimeSeriesCount()).isGreaterThan(0); + assertThat(response.getTimeSeriesCount()).isGreaterThan(0); // Verify that metrics are published for ReadRows request metricFilter = @@ -125,12 +136,7 @@ public void testBuiltinMetrics() throws Exception { testEnvRule.env().getInstanceId()); requestBuilder.setFilter(metricFilter); response = metricClient.listTimeSeriesCallable().call(requestBuilder.build()); - Truth.assertThat(response.getTimeSeriesCount()).isGreaterThan(0); + assertThat(response.getTimeSeriesCount()).isGreaterThan(0); } } - - @AfterClass - public static void tearDown() { - metricClient.close(); - } } From f0d424be6f34f58264d38c3dbe9966718af80ea2 Mon Sep 17 00:00:00 2001 From: Mattie Fu Date: Fri, 19 Aug 2022 13:25:51 -0400 Subject: [PATCH 05/11] address comments --- .../cloud/bigtable/data/v2/it/BuiltinMetricsIT.java | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/BuiltinMetricsIT.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/BuiltinMetricsIT.java index b4a21e3084c2..f619f86f0a4a 100644 --- a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/BuiltinMetricsIT.java +++ b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/BuiltinMetricsIT.java @@ -15,8 +15,8 @@ */ package com.google.cloud.bigtable.data.v2.it; -import static com.google.common.truth.TruthJUnit.assume; import static com.google.common.truth.Truth.assertThat; +import static com.google.common.truth.TruthJUnit.assume; import com.google.api.client.util.Lists; import com.google.cloud.bigtable.data.v2.BigtableDataSettings; @@ -26,7 +26,6 @@ import com.google.cloud.bigtable.test_helpers.env.EmulatorEnv; import com.google.cloud.bigtable.test_helpers.env.TestEnvRule; import com.google.cloud.monitoring.v3.MetricServiceClient; -import com.google.cloud.monitoring.v3.MetricServiceSettings; import com.google.monitoring.v3.ListTimeSeriesRequest; import com.google.monitoring.v3.ListTimeSeriesResponse; import com.google.monitoring.v3.ProjectName; @@ -35,8 +34,6 @@ import java.io.IOException; import java.time.Duration; import java.util.ArrayList; -import java.util.concurrent.TimeUnit; - import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.ClassRule; @@ -68,12 +65,8 @@ public static void setUpClass() throws IOException { // Enable built in metrics BigtableDataSettings.enableBuiltinMetrics(); - MetricServiceSettings settings = - MetricServiceSettings.newBuilder() - .setEndpoint("staging-monitoring.sandbox.googleapis.com:443") - .build(); // Create a cloud monitoring client - metricClient = MetricServiceClient.create(settings); + metricClient = MetricServiceClient.create(); } @AfterClass @@ -103,7 +96,7 @@ public void testBuiltinMetrics() throws Exception { ProjectName name = ProjectName.of(testEnvRule.env().getProjectId()); // Restrict time to last 10 minutes - long startMillis = System.currentTimeMillis() - Duration.ofMinutes (10).toMillis(); + long startMillis = System.currentTimeMillis() - Duration.ofMinutes(10).toMillis(); TimeInterval interval = TimeInterval.newBuilder() .setStartTime(Timestamps.fromMillis(startMillis)) From 00b540da2522c706809c281c4c34cbb3f348777d Mon Sep 17 00:00:00 2001 From: Mattie Fu Date: Fri, 19 Aug 2022 13:55:46 -0400 Subject: [PATCH 06/11] remove debugging --- .../bigtable/stats/BigtableCreateTimeSeriesExporter.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/google-cloud-bigtable-stats/src/main/java/com/google/cloud/bigtable/stats/BigtableCreateTimeSeriesExporter.java b/google-cloud-bigtable-stats/src/main/java/com/google/cloud/bigtable/stats/BigtableCreateTimeSeriesExporter.java index 5ae9162c13aa..ad2e76867cef 100644 --- a/google-cloud-bigtable-stats/src/main/java/com/google/cloud/bigtable/stats/BigtableCreateTimeSeriesExporter.java +++ b/google-cloud-bigtable-stats/src/main/java/com/google/cloud/bigtable/stats/BigtableCreateTimeSeriesExporter.java @@ -16,7 +16,6 @@ package com.google.cloud.bigtable.stats; import com.google.api.MonitoredResource; -import com.google.api.gax.grpc.GrpcResponseMetadata; import com.google.cloud.monitoring.v3.MetricServiceClient; import com.google.monitoring.v3.CreateTimeSeriesRequest; import com.google.monitoring.v3.ProjectName; @@ -73,16 +72,12 @@ public void export(Collection metrics) { for (Map.Entry> entry : projectToTimeSeries.entrySet()) { ProjectName projectName = ProjectName.of(entry.getKey()); - GrpcResponseMetadata metadata = new GrpcResponseMetadata(); CreateTimeSeriesRequest request = CreateTimeSeriesRequest.newBuilder() .setName(projectName.toString()) .addAllTimeSeries(entry.getValue()) .build(); - this.metricServiceClient - .createTimeSeriesCallable() - .call(request, metadata.createContextWithHandlers()); - // this.metricServiceClient.createServiceTimeSeries(request); + this.metricServiceClient.createServiceTimeSeries(request); } } catch (Throwable e) { logger.log(Level.WARNING, "Exception thrown when exporting TimeSeries.", e); From 954c0efc67e787bbbf1f5cc388cc74017ca82c7c Mon Sep 17 00:00:00 2001 From: Mattie Fu Date: Fri, 19 Aug 2022 14:09:45 -0400 Subject: [PATCH 07/11] fix dependency test --- google-cloud-bigtable-stats/pom.xml | 5 +++++ google-cloud-bigtable/pom.xml | 10 ---------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/google-cloud-bigtable-stats/pom.xml b/google-cloud-bigtable-stats/pom.xml index 78e7cc5fc2a3..74ae274f6cf5 100644 --- a/google-cloud-bigtable-stats/pom.xml +++ b/google-cloud-bigtable-stats/pom.xml @@ -69,6 +69,11 @@ com.google.http-client google-http-client + + + io.opencensus + opencensus-proto + diff --git a/google-cloud-bigtable/pom.xml b/google-cloud-bigtable/pom.xml index 1be4f681448c..826c6f23dc9f 100644 --- a/google-cloud-bigtable/pom.xml +++ b/google-cloud-bigtable/pom.xml @@ -61,7 +61,6 @@ pom import - @@ -664,16 +663,7 @@ io.grpc:grpc-auth,io.grpc:grpc-grpclb io.opencensus:opencensus-impl-core - - - - - - - - - From ed532cba373d474f9ccd8f5ba3daffc6576f1a3a Mon Sep 17 00:00:00 2001 From: Mattie Fu Date: Fri, 19 Aug 2022 14:13:50 -0400 Subject: [PATCH 08/11] update comment --- google-cloud-bigtable-stats/pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/google-cloud-bigtable-stats/pom.xml b/google-cloud-bigtable-stats/pom.xml index 74ae274f6cf5..41b73ab041d5 100644 --- a/google-cloud-bigtable-stats/pom.xml +++ b/google-cloud-bigtable-stats/pom.xml @@ -59,7 +59,7 @@ com.google.cloud google-cloud-monitoring - + com.google.http-client @@ -69,7 +69,6 @@ com.google.http-client google-http-client - io.opencensus opencensus-proto From 535ba53488fc7f60f7ae4471edaf00bc4a8982a2 Mon Sep 17 00:00:00 2001 From: Mattie Fu Date: Thu, 25 Aug 2022 11:32:04 -0400 Subject: [PATCH 09/11] update integration test to only close client if it's not null --- .../google/cloud/bigtable/data/v2/it/BuiltinMetricsIT.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/BuiltinMetricsIT.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/BuiltinMetricsIT.java index f619f86f0a4a..25ec8e442ee1 100644 --- a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/BuiltinMetricsIT.java +++ b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/BuiltinMetricsIT.java @@ -71,7 +71,9 @@ public static void setUpClass() throws IOException { @AfterClass public static void tearDown() { - metricClient.close(); + if (metricClient != null) { + metricClient.close(); + } } @Test From 1ed7df16239d4a0c298cd792128764ce323eb9d7 Mon Sep 17 00:00:00 2001 From: Mattie Fu Date: Thu, 25 Aug 2022 13:12:21 -0400 Subject: [PATCH 10/11] explain why we're including grpc-xds --- google-cloud-bigtable-stats/pom.xml | 4 ---- google-cloud-bigtable/pom.xml | 8 ++++++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/google-cloud-bigtable-stats/pom.xml b/google-cloud-bigtable-stats/pom.xml index 41b73ab041d5..dfa00eb8b214 100644 --- a/google-cloud-bigtable-stats/pom.xml +++ b/google-cloud-bigtable-stats/pom.xml @@ -69,10 +69,6 @@ com.google.http-client google-http-client - - io.opencensus - opencensus-proto - diff --git a/google-cloud-bigtable/pom.xml b/google-cloud-bigtable/pom.xml index 826c6f23dc9f..00014c374df2 100644 --- a/google-cloud-bigtable/pom.xml +++ b/google-cloud-bigtable/pom.xml @@ -262,6 +262,14 @@ + + + io.grpc + grpc-xds + runtime + com.google.cloud google-cloud-monitoring From 6cfea25435123b19f61be5702fe4ad63e0ef6366 Mon Sep 17 00:00:00 2001 From: Owl Bot Date: Thu, 25 Aug 2022 17:19:02 +0000 Subject: [PATCH 11/11] =?UTF-8?q?=F0=9F=A6=89=20Updates=20from=20OwlBot=20?= =?UTF-8?q?post-processor?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1c1a2c985a67..ee2acd7fa530 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.10.3' +implementation 'com.google.cloud:google-cloud-bigtable:2.11.0' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-bigtable" % "2.10.3" +libraryDependencies += "com.google.cloud" % "google-cloud-bigtable" % "2.11.0" ``` ## Authentication