Skip to content
This repository was archived by the owner on May 8, 2026. It is now read-only.

Commit 65f0f4b

Browse files
chore: remove stale metrics code
Change-Id: Ib98c15b0531f70d1c0bd65ffbd2161b3e605448a
1 parent 7eb0ba8 commit 65f0f4b

30 files changed

Lines changed: 374 additions & 1289 deletions

google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/internal/csm/MetricRegistry.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
* </ul>
5454
*/
5555
public class MetricRegistry {
56-
static final String METER_NAME = "bigtable.googleapis.com/internal/client/";
56+
public static final String METER_NAME = "bigtable.googleapis.com/internal/client/";
5757

5858
final TableOperationLatency operationLatencyMetric;
5959
final TableAttemptLatency attemptLatencyMetric;

google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/internal/csm/MetricsImpl.java

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import com.google.cloud.bigtable.data.v2.internal.csm.attributes.ClientInfo;
2626
import com.google.cloud.bigtable.data.v2.internal.csm.attributes.EnvInfo;
2727
import com.google.cloud.bigtable.data.v2.stub.metrics.BigtableCloudMonitoringExporter;
28-
import com.google.cloud.bigtable.data.v2.stub.metrics.BuiltinMetricsConstants;
2928
import com.google.cloud.bigtable.data.v2.stub.metrics.BuiltinMetricsTracerFactory;
3029
import com.google.cloud.bigtable.data.v2.stub.metrics.ChannelPoolMetricsTracer;
3130
import com.google.cloud.bigtable.data.v2.stub.metrics.CompositeTracerFactory;
@@ -42,18 +41,15 @@
4241
import io.opencensus.tags.Tagger;
4342
import io.opentelemetry.api.OpenTelemetry;
4443
import io.opentelemetry.sdk.OpenTelemetrySdk;
45-
import io.opentelemetry.sdk.metrics.InstrumentSelector;
4644
import io.opentelemetry.sdk.metrics.SdkMeterProvider;
4745
import io.opentelemetry.sdk.metrics.SdkMeterProviderBuilder;
48-
import io.opentelemetry.sdk.metrics.View;
4946
import io.opentelemetry.sdk.metrics.export.MetricExporter;
5047
import io.opentelemetry.sdk.metrics.export.PeriodicMetricReader;
5148
import io.opentelemetry.sdk.metrics.export.PeriodicMetricReaderBuilder;
5249
import java.io.Closeable;
5350
import java.io.IOException;
5451
import java.util.ArrayList;
5552
import java.util.List;
56-
import java.util.Map;
5753
import java.util.concurrent.ScheduledExecutorService;
5854
import java.util.concurrent.ScheduledFuture;
5955
import javax.annotation.Nullable;
@@ -100,7 +96,7 @@ public MetricsImpl(
10096
// Disable default grpc metrics
10197
.disableAllMetrics()
10298
// Enable specific grpc metrics
103-
.enableMetrics(BuiltinMetricsConstants.GRPC_METRICS.keySet())
99+
.enableMetrics(metricRegistry.getGrpcMetricNames())
104100
.build();
105101
} else {
106102
this.grpcOtel = null;
@@ -185,19 +181,14 @@ public static OpenTelemetrySdk createBuiltinOtel(
185181

186182
SdkMeterProviderBuilder meterProvider = SdkMeterProvider.builder();
187183

188-
for (Map.Entry<InstrumentSelector, View> entry :
189-
BuiltinMetricsConstants.getAllViews().entrySet()) {
190-
meterProvider.registerView(entry.getKey(), entry.getValue());
191-
}
192-
193-
for (Map.Entry<InstrumentSelector, View> e :
194-
BuiltinMetricsConstants.getInternalViews().entrySet()) {
195-
meterProvider.registerView(e.getKey(), e.getValue());
196-
}
197-
198184
MetricExporter publicExporter =
199185
BigtableCloudMonitoringExporter.create(
200-
metricRegistry, EnvInfo::detect, clientInfo, credentials, metricsEndpoint, universeDomain);
186+
metricRegistry,
187+
EnvInfo::detect,
188+
clientInfo,
189+
credentials,
190+
metricsEndpoint,
191+
universeDomain);
201192
PeriodicMetricReaderBuilder readerBuilder =
202193
PeriodicMetricReader.builder(publicExporter).setExecutor(executor);
203194
meterProvider.registerMetricReader(readerBuilder.build());

google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/internal/csm/metrics/ClientBatchWriteFlowControlFactor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import io.opentelemetry.api.metrics.Meter;
2626

2727
public class ClientBatchWriteFlowControlFactor extends MetricWrapper<ClientSchema> {
28-
private static final String NAME =
28+
public static final String NAME =
2929
"bigtable.googleapis.com/internal/client/batch_write_flow_control_factor";
3030

3131
public ClientBatchWriteFlowControlFactor() {

google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/internal/csm/metrics/ClientBatchWriteFlowControlTargetQps.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import io.opentelemetry.api.metrics.Meter;
2525

2626
public class ClientBatchWriteFlowControlTargetQps extends MetricWrapper<ClientSchema> {
27-
private static final String NAME =
27+
public static final String NAME =
2828
"bigtable.googleapis.com/internal/client/batch_write_flow_control_target_qps";
2929

3030
public ClientBatchWriteFlowControlTargetQps() {

google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/internal/csm/metrics/ClientChannelPoolOutstandingRpcs.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import java.util.stream.Collectors;
2929

3030
public class ClientChannelPoolOutstandingRpcs extends MetricWrapper<ClientSchema> {
31-
private static final String NAME =
31+
public static final String NAME =
3232
"bigtable.googleapis.com/internal/client/connection_pool/outstanding_rpcs";
3333

3434
private static final List<Long> BUCKETS =

google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/internal/csm/metrics/ClientPerConnectionErrorCount.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import java.util.Set;
3333

3434
public class ClientPerConnectionErrorCount extends MetricWrapper<ClientSchema> {
35-
private static final String NAME =
35+
public static final String NAME =
3636
"bigtable.googleapis.com/internal/client/per_connection_error_count";
3737

3838
static final List<Long> BUCKETS =

google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/internal/csm/metrics/Constants.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ private MetricLabels() {}
5454
AttributeKey.stringKey("app_profile");
5555
public static final AttributeKey<String> DEBUG_TAG_KEY = AttributeKey.stringKey("tag");
5656

57-
static final AttributeKey<Boolean> APPLIED_KEY = AttributeKey.booleanKey("applied");
57+
public static final AttributeKey<Boolean> APPLIED_KEY = AttributeKey.booleanKey("applied");
5858

5959
static final AttributeKey<String> CHANNEL_POOL_LB_POLICY = AttributeKey.stringKey("lb_policy");
6060
static final AttributeKey<String> DP_REASON_KEY = AttributeKey.stringKey("reason");

google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/internal/csm/metrics/TableApplicationBlockingLatency.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@
3232
import javax.annotation.Nullable;
3333

3434
public class TableApplicationBlockingLatency extends MetricWrapper<TableSchema> {
35-
private static final String NAME =
36-
"bigtable.googleapis.com/internal/client/application_latencies";
35+
public static final String NAME = "bigtable.googleapis.com/internal/client/application_latencies";
3736

3837
public TableApplicationBlockingLatency() {
3938
super(TableSchema.INSTANCE, NAME);

google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/internal/csm/metrics/TableAttemptLatency.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import javax.annotation.Nullable;
3434

3535
public class TableAttemptLatency extends MetricWrapper<TableSchema> {
36-
private static final String NAME = "bigtable.googleapis.com/internal/client/attempt_latencies";
36+
public static final String NAME = "bigtable.googleapis.com/internal/client/attempt_latencies";
3737

3838
public TableAttemptLatency() {
3939
super(TableSchema.INSTANCE, NAME);

google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/internal/csm/metrics/TableAttemptLatency2.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import javax.annotation.Nullable;
3535

3636
public class TableAttemptLatency2 extends MetricWrapper<TableSchema> {
37-
private static final String NAME = "bigtable.googleapis.com/internal/client/attempt_latencies2";
37+
public static final String NAME = "bigtable.googleapis.com/internal/client/attempt_latencies2";
3838

3939
public TableAttemptLatency2() {
4040
super(TableSchema.INSTANCE, NAME);

0 commit comments

Comments
 (0)