diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 799cda7b66..507bd78be1 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -91,7 +91,6 @@ samples) pushd ${SAMPLES_DIR} mvn -B \ - -Penable-samples \ -ntp \ -DtrimStackTrace=false \ -Dclirr.skip=true \ diff --git a/CHANGELOG.md b/CHANGELOG.md index aed7d03d8e..9a735604a9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,19 @@ # Changelog +### [2.3.1](https://www.github.com/googleapis/java-bigtable/compare/v2.3.0...v2.3.1) (2021-12-03) + + +### Bug Fixes + +* add placeholder class for bigtable-stats ([#1075](https://www.github.com/googleapis/java-bigtable/issues/1075)) ([9d9f575](https://www.github.com/googleapis/java-bigtable/commit/9d9f57556216becfeb302bfaf5a4f35a9b73b611)) +* add status label to gfe metrics ([#1077](https://www.github.com/googleapis/java-bigtable/issues/1077)) ([777549e](https://www.github.com/googleapis/java-bigtable/commit/777549e6ac64a03c9bd67d6b5a5cf4819ba8656f)) +* make placeholder class public ([#1085](https://www.github.com/googleapis/java-bigtable/issues/1085)) ([879377a](https://www.github.com/googleapis/java-bigtable/commit/879377a03b86aa9a1f1035245c290ec78501b2cd)) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.5.1 ([#1087](https://www.github.com/googleapis/java-bigtable/issues/1087)) ([f290ce7](https://www.github.com/googleapis/java-bigtable/commit/f290ce74f6b803b8c5786e8b4c69b9efa6995c59)) + ## [2.3.0](https://www.github.com/googleapis/java-bigtable/compare/v2.2.0...v2.3.0) (2021-11-16) diff --git a/google-cloud-bigtable-bom/pom.xml b/google-cloud-bigtable-bom/pom.xml index ff15eb0c34..0859b46080 100644 --- a/google-cloud-bigtable-bom/pom.xml +++ b/google-cloud-bigtable-bom/pom.xml @@ -3,12 +3,12 @@ 4.0.0 com.google.cloud google-cloud-bigtable-bom - 2.3.0 + 2.3.1 pom com.google.cloud google-cloud-shared-config - 1.2.1 + 1.2.2 Google Cloud Bigtable BOM @@ -62,32 +62,32 @@ com.google.cloud google-cloud-bigtable - 2.3.0 + 2.3.1 com.google.cloud google-cloud-bigtable-emulator - 0.140.0 + 0.140.1 com.google.api.grpc grpc-google-cloud-bigtable-admin-v2 - 2.3.0 + 2.3.1 com.google.api.grpc grpc-google-cloud-bigtable-v2 - 2.3.0 + 2.3.1 com.google.api.grpc proto-google-cloud-bigtable-admin-v2 - 2.3.0 + 2.3.1 com.google.api.grpc proto-google-cloud-bigtable-v2 - 2.3.0 + 2.3.1 diff --git a/google-cloud-bigtable-deps-bom/pom.xml b/google-cloud-bigtable-deps-bom/pom.xml index 80e038604f..f96449303c 100644 --- a/google-cloud-bigtable-deps-bom/pom.xml +++ b/google-cloud-bigtable-deps-bom/pom.xml @@ -7,12 +7,12 @@ com.google.cloud google-cloud-shared-config - 1.2.1 + 1.2.2 com.google.cloud google-cloud-bigtable-deps-bom - 2.3.0 + 2.3.1 pom @@ -65,7 +65,7 @@ com.google.cloud google-cloud-shared-dependencies - 2.5.0 + 2.5.1 pom import diff --git a/google-cloud-bigtable-emulator/pom.xml b/google-cloud-bigtable-emulator/pom.xml index 96a20bdd9d..8b9094b201 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.140.0 + 0.140.1 Google Cloud Java - Bigtable Emulator https://github.com/googleapis/java-bigtable @@ -14,7 +14,7 @@ com.google.cloud google-cloud-bigtable-parent - 2.3.0 + 2.3.1 scm:git:git@github.com:googleapis/java-bigtable.git @@ -80,14 +80,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 2.3.0 + 2.3.1 pom import com.google.cloud google-cloud-bigtable-bom - 2.3.0 + 2.3.1 pom import diff --git a/google-cloud-bigtable-stats/pom.xml b/google-cloud-bigtable-stats/pom.xml index a9bd3fdfc6..4318d74bd3 100644 --- a/google-cloud-bigtable-stats/pom.xml +++ b/google-cloud-bigtable-stats/pom.xml @@ -5,7 +5,7 @@ com.google.cloud google-cloud-bigtable-parent - 2.3.0 + 2.3.1 4.0.0 @@ -13,7 +13,7 @@ through Stackdriver. Built-in metrics will be implemented with shaded OpenCensus so it won't interfere with customer's application metrics. --> google-cloud-bigtable-stats - 2.3.0 + 2.3.1 Experimental project to shade OpenCensus dependencies. @@ -21,7 +21,7 @@ com.google.cloud google-cloud-bigtable-deps-bom - 2.3.0 + 2.3.1 pom import diff --git a/google-cloud-bigtable-stats/src/main/java/com/google/cloud/bigtable/stats/MavenPlaceholderShaded.java b/google-cloud-bigtable-stats/src/main/java/com/google/cloud/bigtable/stats/MavenPlaceholderShaded.java new file mode 100644 index 0000000000..44b0633b5b --- /dev/null +++ b/google-cloud-bigtable-stats/src/main/java/com/google/cloud/bigtable/stats/MavenPlaceholderShaded.java @@ -0,0 +1,26 @@ +/* + * Copyright 2021 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.stats; + +public final class MavenPlaceholderShaded { + /** + * This class is here to force generation of source javadoc jars so that the maven release process + * doesn't complain. The shading plugin generated a shaded jar of bigtable-stats, but it doesn't + * generate javadoc or source files; this class is here as a hack and better methods should be + * employed. + */ + private MavenPlaceholderShaded() {} +} diff --git a/google-cloud-bigtable/pom.xml b/google-cloud-bigtable/pom.xml index 07fc84f75b..232d1793b2 100644 --- a/google-cloud-bigtable/pom.xml +++ b/google-cloud-bigtable/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-bigtable - 2.3.0 + 2.3.1 jar Google Cloud Bigtable https://github.com/googleapis/java-bigtable @@ -12,11 +12,11 @@ com.google.cloud google-cloud-bigtable-parent - 2.3.0 + 2.3.1 - 2.3.0 + 2.3.1 google-cloud-bigtable @@ -43,14 +43,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 2.3.0 + 2.3.1 pom import com.google.cloud google-cloud-bigtable-bom - 2.3.0 + 2.3.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 a4d4280b4b..018ed38140 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.3.0"; + public static String VERSION = "2.3.1"; // {x-version-update-end} } diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/BigtableDataSettings.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/BigtableDataSettings.java index e173571ff7..edde257527 100644 --- a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/BigtableDataSettings.java +++ b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/BigtableDataSettings.java @@ -128,7 +128,7 @@ public ManagedChannelBuilder apply(ManagedChannelBuilder input) { return input.usePlaintext(); } }) - .setKeepAliveTime(Duration.ofSeconds(30)) // sends ping in this interval + .setKeepAliveTime(Duration.ofSeconds(61)) // sends ping in this interval .setKeepAliveTimeout( Duration.ofSeconds(10)) // wait this long before considering the connection dead .build()); diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/BigtableTracer.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/BigtableTracer.java index 5fdf625662..844bb8d09f 100644 --- a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/BigtableTracer.java +++ b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/BigtableTracer.java @@ -37,5 +37,5 @@ public abstract class BigtableTracer extends BaseApiTracer { * the response from server-timing header. If server-timing header is missing, increment the * missing header count. */ - public abstract void recordGfeMetadata(@Nullable Long latency); + public abstract void recordGfeMetadata(@Nullable Long latency, @Nullable Throwable throwable); } diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/CompositeTracer.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/CompositeTracer.java index 1167fe17ba..38f9da7329 100644 --- a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/CompositeTracer.java +++ b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/CompositeTracer.java @@ -173,9 +173,9 @@ public int getAttempt() { } @Override - public void recordGfeMetadata(@Nullable Long latency) { + public void recordGfeMetadata(@Nullable Long latency, @Nullable Throwable throwable) { for (BigtableTracer tracer : bigtableTracers) { - tracer.recordGfeMetadata(latency); + tracer.recordGfeMetadata(latency, throwable); } } } diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/HeaderTracerStreamingCallable.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/HeaderTracerStreamingCallable.java index ce757d9f92..31c5cf1960 100644 --- a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/HeaderTracerStreamingCallable.java +++ b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/HeaderTracerStreamingCallable.java @@ -96,7 +96,7 @@ public void onError(Throwable t) { // so it's not checking trailing metadata here. Metadata metadata = responseMetadata.getMetadata(); Long latency = Util.getGfeLatency(metadata); - tracer.recordGfeMetadata(latency); + tracer.recordGfeMetadata(latency, t); outerObserver.onError(t); } @@ -104,7 +104,7 @@ public void onError(Throwable t) { public void onComplete() { Metadata metadata = responseMetadata.getMetadata(); Long latency = Util.getGfeLatency(metadata); - tracer.recordGfeMetadata(latency); + tracer.recordGfeMetadata(latency, null); outerObserver.onComplete(); } } diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/HeaderTracerUnaryCallable.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/HeaderTracerUnaryCallable.java index 1354cd2b88..6335b433ef 100644 --- a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/HeaderTracerUnaryCallable.java +++ b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/HeaderTracerUnaryCallable.java @@ -16,6 +16,8 @@ package com.google.cloud.bigtable.data.v2.stub.metrics; import com.google.api.core.ApiFuture; +import com.google.api.core.ApiFutureCallback; +import com.google.api.core.ApiFutures; import com.google.api.core.InternalApi; import com.google.api.gax.grpc.GrpcResponseMetadata; import com.google.api.gax.rpc.ApiCallContext; @@ -51,27 +53,42 @@ public HeaderTracerUnaryCallable(@Nonnull UnaryCallable inn @Override public ApiFuture futureCall(RequestT request, ApiCallContext context) { - if (RpcViews.isGfeMetricsRegistered()) { + // tracer should always be an instance of BigtableTracer + if (RpcViews.isGfeMetricsRegistered() && context.getTracer() instanceof BigtableTracer) { final GrpcResponseMetadata responseMetadata = new GrpcResponseMetadata(); final ApiCallContext contextWithResponseMetadata = responseMetadata.addHandlers(context); + HeaderTracerUnaryCallback callback = + new HeaderTracerUnaryCallback((BigtableTracer) context.getTracer(), responseMetadata); ApiFuture future = innerCallable.futureCall(request, contextWithResponseMetadata); - future.addListener( - new Runnable() { - @Override - public void run() { - // this should always be true - if (contextWithResponseMetadata.getTracer() instanceof BigtableTracer) { - BigtableTracer tracer = (BigtableTracer) contextWithResponseMetadata.getTracer(); - Metadata metadata = responseMetadata.getMetadata(); - Long latency = Util.getGfeLatency(metadata); - tracer.recordGfeMetadata(latency); - } - } - }, - MoreExecutors.directExecutor()); + ApiFutures.addCallback(future, callback, MoreExecutors.directExecutor()); return future; } else { return innerCallable.futureCall(request, context); } } + + class HeaderTracerUnaryCallback implements ApiFutureCallback { + + private final BigtableTracer tracer; + private final GrpcResponseMetadata responseMetadata; + + HeaderTracerUnaryCallback(BigtableTracer tracer, GrpcResponseMetadata responseMetadata) { + this.tracer = tracer; + this.responseMetadata = responseMetadata; + } + + @Override + public void onFailure(Throwable throwable) { + Metadata metadata = responseMetadata.getMetadata(); + Long latency = Util.getGfeLatency(metadata); + tracer.recordGfeMetadata(latency, throwable); + } + + @Override + public void onSuccess(ResponseT response) { + Metadata metadata = responseMetadata.getMetadata(); + Long latency = Util.getGfeLatency(metadata); + tracer.recordGfeMetadata(latency, null); + } + } } diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/MetricsTracer.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/MetricsTracer.java index 3d3f6348be..af220aee78 100644 --- a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/MetricsTracer.java +++ b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/MetricsTracer.java @@ -211,7 +211,7 @@ public int getAttempt() { } @Override - public void recordGfeMetadata(@Nullable Long latency) { + public void recordGfeMetadata(@Nullable Long latency, @Nullable Throwable throwable) { MeasureMap measures = stats.newMeasureMap(); if (latency != null) { measures @@ -220,7 +220,10 @@ public void recordGfeMetadata(@Nullable Long latency) { } else { measures.put(RpcMeasureConstants.BIGTABLE_GFE_HEADER_MISSING_COUNT, 1L); } - measures.record(newTagCtxBuilder().build()); + measures.record( + newTagCtxBuilder() + .putLocal(RpcMeasureConstants.BIGTABLE_STATUS, Util.extractStatus(throwable)) + .build()); } private TagContextBuilder newTagCtxBuilder() { diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/RpcViewConstants.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/RpcViewConstants.java index 8a14c01b13..a4acf9ea6e 100644 --- a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/RpcViewConstants.java +++ b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/RpcViewConstants.java @@ -136,7 +136,11 @@ class RpcViewConstants { BIGTABLE_GFE_LATENCY, AGGREGATION_WITH_MILLIS_HISTOGRAM, ImmutableList.of( - BIGTABLE_INSTANCE_ID, BIGTABLE_PROJECT_ID, BIGTABLE_APP_PROFILE_ID, BIGTABLE_OP)); + BIGTABLE_INSTANCE_ID, + BIGTABLE_PROJECT_ID, + BIGTABLE_APP_PROFILE_ID, + BIGTABLE_OP, + BIGTABLE_STATUS)); static final View BIGTABLE_GFE_HEADER_MISSING_COUNT_VIEW = View.create( @@ -145,5 +149,9 @@ class RpcViewConstants { BIGTABLE_GFE_HEADER_MISSING_COUNT, SUM, ImmutableList.of( - BIGTABLE_INSTANCE_ID, BIGTABLE_PROJECT_ID, BIGTABLE_APP_PROFILE_ID, BIGTABLE_OP)); + BIGTABLE_INSTANCE_ID, + BIGTABLE_PROJECT_ID, + BIGTABLE_APP_PROFILE_ID, + BIGTABLE_OP, + BIGTABLE_STATUS)); } diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/metrics/CompositeTracerTest.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/metrics/CompositeTracerTest.java index 5d69c19f2b..bed0921feb 100644 --- a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/metrics/CompositeTracerTest.java +++ b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/metrics/CompositeTracerTest.java @@ -23,6 +23,8 @@ import com.google.api.gax.tracing.ApiTracer; import com.google.api.gax.tracing.ApiTracer.Scope; import com.google.common.collect.ImmutableList; +import io.grpc.Status; +import io.grpc.StatusRuntimeException; import org.junit.Assert; import org.junit.Before; import org.junit.Rule; @@ -222,8 +224,9 @@ public void testGetAttempt() { @Test public void testRecordGfeLatency() { - compositeTracer.recordGfeMetadata(20L); - verify(child3, times(1)).recordGfeMetadata(20L); - verify(child4, times(1)).recordGfeMetadata(20L); + Throwable t = new StatusRuntimeException(Status.UNAVAILABLE); + compositeTracer.recordGfeMetadata(20L, t); + verify(child3, times(1)).recordGfeMetadata(20L, t); + verify(child4, times(1)).recordGfeMetadata(20L, t); } } diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/metrics/HeaderTracerCallableTest.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/metrics/HeaderTracerCallableTest.java index 9538b6a135..03aad7f822 100644 --- a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/metrics/HeaderTracerCallableTest.java +++ b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/metrics/HeaderTracerCallableTest.java @@ -168,7 +168,8 @@ public void testGFELatencyMetricReadRows() throws InterruptedException { localStats, RpcViewConstants.BIGTABLE_GFE_LATENCY_VIEW, ImmutableMap.of( - RpcMeasureConstants.BIGTABLE_OP, TagValue.create("Bigtable.ReadRows")), + RpcMeasureConstants.BIGTABLE_OP, TagValue.create("Bigtable.ReadRows"), + RpcMeasureConstants.BIGTABLE_STATUS, TagValue.create("OK")), PROJECT_ID, INSTANCE_ID, APP_PROFILE_ID); @@ -186,7 +187,9 @@ public void testGFELatencyMetricMutateRow() throws InterruptedException { StatsTestUtils.getAggregationValueAsLong( localStats, RpcViewConstants.BIGTABLE_GFE_LATENCY_VIEW, - ImmutableMap.of(RpcMeasureConstants.BIGTABLE_OP, TagValue.create("Bigtable.MutateRow")), + ImmutableMap.of( + RpcMeasureConstants.BIGTABLE_OP, TagValue.create("Bigtable.MutateRow"), + RpcMeasureConstants.BIGTABLE_STATUS, TagValue.create("OK")), PROJECT_ID, INSTANCE_ID, APP_PROFILE_ID); @@ -208,7 +211,8 @@ public void testGFELatencyMetricMutateRows() throws InterruptedException { localStats, RpcViewConstants.BIGTABLE_GFE_LATENCY_VIEW, ImmutableMap.of( - RpcMeasureConstants.BIGTABLE_OP, TagValue.create("Bigtable.MutateRows")), + RpcMeasureConstants.BIGTABLE_OP, TagValue.create("Bigtable.MutateRows"), + RpcMeasureConstants.BIGTABLE_STATUS, TagValue.create("OK")), PROJECT_ID, INSTANCE_ID, APP_PROFILE_ID); @@ -226,7 +230,8 @@ public void testGFELatencySampleRowKeys() throws InterruptedException { localStats, RpcViewConstants.BIGTABLE_GFE_LATENCY_VIEW, ImmutableMap.of( - RpcMeasureConstants.BIGTABLE_OP, TagValue.create("Bigtable.SampleRowKeys")), + RpcMeasureConstants.BIGTABLE_OP, TagValue.create("Bigtable.SampleRowKeys"), + RpcMeasureConstants.BIGTABLE_STATUS, TagValue.create("OK")), PROJECT_ID, INSTANCE_ID, APP_PROFILE_ID); @@ -246,7 +251,8 @@ public void testGFELatencyCheckAndMutateRow() throws InterruptedException { localStats, RpcViewConstants.BIGTABLE_GFE_LATENCY_VIEW, ImmutableMap.of( - RpcMeasureConstants.BIGTABLE_OP, TagValue.create("Bigtable.CheckAndMutateRow")), + RpcMeasureConstants.BIGTABLE_OP, TagValue.create("Bigtable.CheckAndMutateRow"), + RpcMeasureConstants.BIGTABLE_STATUS, TagValue.create("OK")), PROJECT_ID, INSTANCE_ID, APP_PROFILE_ID); @@ -266,7 +272,8 @@ public void testGFELatencyReadModifyWriteRow() throws InterruptedException { localStats, RpcViewConstants.BIGTABLE_GFE_LATENCY_VIEW, ImmutableMap.of( - RpcMeasureConstants.BIGTABLE_OP, TagValue.create("Bigtable.ReadModifyWriteRow")), + RpcMeasureConstants.BIGTABLE_OP, TagValue.create("Bigtable.ReadModifyWriteRow"), + RpcMeasureConstants.BIGTABLE_STATUS, TagValue.create("OK")), PROJECT_ID, INSTANCE_ID, APP_PROFILE_ID); @@ -285,7 +292,11 @@ public void testGFEMissingHeaderMetric() throws InterruptedException { StatsTestUtils.getAggregationValueAsLong( localStats, RpcViewConstants.BIGTABLE_GFE_HEADER_MISSING_COUNT_VIEW, - ImmutableMap.of(RpcMeasureConstants.BIGTABLE_OP, TagValue.create("Bigtable.MutateRow")), + ImmutableMap.of( + RpcMeasureConstants.BIGTABLE_OP, + TagValue.create("Bigtable.MutateRow"), + RpcMeasureConstants.BIGTABLE_STATUS, + TagValue.create("OK")), PROJECT_ID, INSTANCE_ID, APP_PROFILE_ID); @@ -294,7 +305,8 @@ public void testGFEMissingHeaderMetric() throws InterruptedException { localStats, RpcViewConstants.BIGTABLE_GFE_HEADER_MISSING_COUNT_VIEW, ImmutableMap.of( - RpcMeasureConstants.BIGTABLE_OP, TagValue.create("Bigtable.ReadRows")), + RpcMeasureConstants.BIGTABLE_OP, TagValue.create("Bigtable.ReadRows"), + RpcMeasureConstants.BIGTABLE_STATUS, TagValue.create("OK")), PROJECT_ID, INSTANCE_ID, APP_PROFILE_ID); @@ -321,7 +333,11 @@ public void testGFEMissingHeaderMetric() throws InterruptedException { StatsTestUtils.getAggregationValueAsLong( localStats, RpcViewConstants.BIGTABLE_GFE_HEADER_MISSING_COUNT_VIEW, - ImmutableMap.of(RpcMeasureConstants.BIGTABLE_OP, TagValue.create("Bigtable.MutateRow")), + ImmutableMap.of( + RpcMeasureConstants.BIGTABLE_OP, + TagValue.create("Bigtable.MutateRow"), + RpcMeasureConstants.BIGTABLE_STATUS, + TagValue.create("OK")), PROJECT_ID, INSTANCE_ID, APP_PROFILE_ID); @@ -330,7 +346,10 @@ public void testGFEMissingHeaderMetric() throws InterruptedException { localStats, RpcViewConstants.BIGTABLE_GFE_HEADER_MISSING_COUNT_VIEW, ImmutableMap.of( - RpcMeasureConstants.BIGTABLE_OP, TagValue.create("Bigtable.ReadRows")), + RpcMeasureConstants.BIGTABLE_OP, + TagValue.create("Bigtable.ReadRows"), + RpcMeasureConstants.BIGTABLE_STATUS, + TagValue.create("OK")), PROJECT_ID, INSTANCE_ID, APP_PROFILE_ID); @@ -353,7 +372,11 @@ public void testMetricsWithErrorResponse() throws InterruptedException { StatsTestUtils.getAggregationValueAsLong( localStats, RpcViewConstants.BIGTABLE_GFE_HEADER_MISSING_COUNT_VIEW, - ImmutableMap.of(RpcMeasureConstants.BIGTABLE_OP, TagValue.create("Bigtable.ReadRows")), + ImmutableMap.of( + RpcMeasureConstants.BIGTABLE_OP, + TagValue.create("Bigtable.ReadRows"), + RpcMeasureConstants.BIGTABLE_STATUS, + TagValue.create("UNAVAILABLE")), PROJECT_ID, INSTANCE_ID, APP_PROFILE_ID); diff --git a/grpc-google-cloud-bigtable-admin-v2/pom.xml b/grpc-google-cloud-bigtable-admin-v2/pom.xml index 06b7065a53..d62ff02b8f 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.3.0 + 2.3.1 grpc-google-cloud-bigtable-admin-v2 GRPC library for grpc-google-cloud-bigtable-admin-v2 com.google.cloud google-cloud-bigtable-parent - 2.3.0 + 2.3.1 @@ -18,14 +18,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 2.3.0 + 2.3.1 pom import com.google.cloud google-cloud-bigtable-bom - 2.3.0 + 2.3.1 pom import diff --git a/grpc-google-cloud-bigtable-v2/pom.xml b/grpc-google-cloud-bigtable-v2/pom.xml index dc249028e0..b205552d80 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.3.0 + 2.3.1 grpc-google-cloud-bigtable-v2 GRPC library for grpc-google-cloud-bigtable-v2 com.google.cloud google-cloud-bigtable-parent - 2.3.0 + 2.3.1 @@ -18,14 +18,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 2.3.0 + 2.3.1 pom import com.google.cloud google-cloud-bigtable-bom - 2.3.0 + 2.3.1 pom import diff --git a/pom.xml b/pom.xml index 8e23bc0cfe..d69c7fcd67 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ google-cloud-bigtable-parent pom - 2.3.0 + 2.3.1 Google Cloud Bigtable Parent https://github.com/googleapis/java-bigtable @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 1.2.1 + 1.2.2 @@ -181,7 +181,7 @@ org.mockito mockito-core - 4.0.0 + 4.1.0 diff --git a/proto-google-cloud-bigtable-admin-v2/pom.xml b/proto-google-cloud-bigtable-admin-v2/pom.xml index e5993ef9a0..caebb98a00 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.3.0 + 2.3.1 proto-google-cloud-bigtable-admin-v2 PROTO library for proto-google-cloud-bigtable-admin-v2 com.google.cloud google-cloud-bigtable-parent - 2.3.0 + 2.3.1 @@ -18,14 +18,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 2.3.0 + 2.3.1 pom import com.google.cloud google-cloud-bigtable-bom - 2.3.0 + 2.3.1 pom import diff --git a/proto-google-cloud-bigtable-v2/pom.xml b/proto-google-cloud-bigtable-v2/pom.xml index 74c0aef67c..a441bbd7fb 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.3.0 + 2.3.1 proto-google-cloud-bigtable-v2 PROTO library for proto-google-cloud-bigtable-v2 com.google.cloud google-cloud-bigtable-parent - 2.3.0 + 2.3.1 @@ -18,14 +18,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 2.3.0 + 2.3.1 pom import com.google.cloud google-cloud-bigtable-bom - 2.3.0 + 2.3.1 pom import diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 8cdaaf738e..305144c088 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-bigtable - 2.2.0 + 2.3.0 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index b3e2ae2a19..bf609c2865 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-bigtable - 2.3.0 + 2.3.1 diff --git a/synth.metadata b/synth.metadata index 3c8ea6b612..f15f922002 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-bigtable.git", - "sha": "8e70884dca734934f5ed2cf004fce7c3a42357fd" + "sha": "bbcb0456b8764d2769197b613bde68411ed333ec" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "42a3786737c17ece39924d7025f3be481812da53" + "sha": "7a7c48f96e90d1cdc3ab0cc8293279fdcb10fd36" } } ], diff --git a/versions.txt b/versions.txt index 86b369a82e..70d2df01a9 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-bigtable:2.3.0:2.3.0 -grpc-google-cloud-bigtable-admin-v2:2.3.0:2.3.0 -grpc-google-cloud-bigtable-v2:2.3.0:2.3.0 -proto-google-cloud-bigtable-admin-v2:2.3.0:2.3.0 -proto-google-cloud-bigtable-v2:2.3.0:2.3.0 -google-cloud-bigtable-emulator:0.140.0:0.140.0 +google-cloud-bigtable:2.3.1:2.3.1 +grpc-google-cloud-bigtable-admin-v2:2.3.1:2.3.1 +grpc-google-cloud-bigtable-v2:2.3.1:2.3.1 +proto-google-cloud-bigtable-admin-v2:2.3.1:2.3.1 +proto-google-cloud-bigtable-v2:2.3.1:2.3.1 +google-cloud-bigtable-emulator:0.140.1:0.140.1