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 0b4732b8aa..e173571ff7 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 @@ -193,12 +193,6 @@ public static void enableGfeOpenCensusStats() { com.google.cloud.bigtable.data.v2.stub.metrics.RpcViews.registerBigtableClientGfeViews(); } - /** Enables OpenCensus metric aggregations for Batch operations. */ - @BetaApi("OpenCensus stats integration is currently unstable and may change in the future") - public static void enableOpenCensusBatchStats() { - com.google.cloud.bigtable.data.v2.stub.metrics.RpcViews.registerBigtableClientBatchViews(); - } - /** Returns the target project id. */ public String getProjectId() { return stubSettings.getProjectId(); diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/RpcViews.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/RpcViews.java index 6328436b3a..8b8296b054 100644 --- a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/RpcViews.java +++ b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/RpcViews.java @@ -31,16 +31,14 @@ public class RpcViews { RpcViewConstants.BIGTABLE_COMPLETED_OP_VIEW, RpcViewConstants.BIGTABLE_READ_ROWS_FIRST_ROW_LATENCY_VIEW, RpcViewConstants.BIGTABLE_ATTEMPT_LATENCY_VIEW, - RpcViewConstants.BIGTABLE_ATTEMPTS_PER_OP_VIEW); + RpcViewConstants.BIGTABLE_ATTEMPTS_PER_OP_VIEW, + RpcViewConstants.BIGTABLE_BATCH_THROTTLED_TIME_VIEW); private static final ImmutableSet GFE_VIEW_SET = ImmutableSet.of( RpcViewConstants.BIGTABLE_GFE_LATENCY_VIEW, RpcViewConstants.BIGTABLE_GFE_HEADER_MISSING_COUNT_VIEW); - private static final ImmutableSet BIGTABLE_BATCH_VIEWS_SET = - ImmutableSet.of(RpcViewConstants.BIGTABLE_BATCH_THROTTLED_TIME_VIEW); - private static boolean gfeMetricsRegistered = false; /** Registers all Bigtable specific views. */ @@ -58,11 +56,6 @@ public static void registerBigtableClientGfeViews() { registerBigtableClientGfeViews(Stats.getViewManager()); } - /** Register Bigtable batch views. */ - public static void registerBigtableClientBatchViews() { - registerBigtableClientBatchViews(Stats.getViewManager()); - } - @VisibleForTesting static void registerBigtableClientViews(ViewManager viewManager) { for (View view : BIGTABLE_CLIENT_VIEWS_SET) { @@ -78,13 +71,6 @@ static void registerBigtableClientGfeViews(ViewManager viewManager) { gfeMetricsRegistered = true; } - @VisibleForTesting - static void registerBigtableClientBatchViews(ViewManager viewManager) { - for (View view : BIGTABLE_BATCH_VIEWS_SET) { - viewManager.registerView(view); - } - } - static boolean isGfeMetricsRegistered() { return gfeMetricsRegistered; } diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/metrics/MetricsTracerTest.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/metrics/MetricsTracerTest.java index ab31ec2f8a..8eb9c46ffc 100644 --- a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/metrics/MetricsTracerTest.java +++ b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/metrics/MetricsTracerTest.java @@ -109,7 +109,6 @@ public void setUp() throws Exception { serviceHelper.start(); RpcViews.registerBigtableClientViews(localStats.getViewManager()); - RpcViews.registerBigtableClientBatchViews(localStats.getViewManager()); settings = BigtableDataSettings.newBuilderForEmulator(serviceHelper.getPort())