record metrics whenever it's registered

googleapis · Mar 29, 2024 · ecf3acd · ecf3acd
1 parent 21cad39
commit ecf3acd
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/...le/src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStubSettings.java b/...le/src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStubSettings.java
@@ -44,9 +44,9 @@
 import com.google.cloud.bigtable.data.v2.models.ReadModifyWriteRow;
 import com.google.cloud.bigtable.data.v2.models.Row;
 import com.google.cloud.bigtable.data.v2.models.RowMutation;
+import com.google.cloud.bigtable.data.v2.stub.metrics.BuiltinMetricsView;
 import com.google.cloud.bigtable.data.v2.stub.metrics.DefaultMetricsProvider;
 import com.google.cloud.bigtable.data.v2.stub.metrics.MetricsProvider;
-import com.google.cloud.bigtable.data.v2.stub.metrics.NoopMetricsProvider;
 import com.google.cloud.bigtable.data.v2.stub.mutaterows.MutateRowsBatchingDescriptor;
 import com.google.cloud.bigtable.data.v2.stub.readrows.ReadRowsBatchingDescriptor;
 import com.google.common.base.MoreObjects;
@@ -1068,8 +1068,7 @@ public EnhancedBigtableStubSettings build() {
 
  featureFlags.setRoutingCookie(this.getEnableRoutingCookie());
  featureFlags.setRetryInfo(this.getEnableRetryInfo());
- featureFlags.setClientSideMetricsEnabled(
- !(this.getMetricsProvider() instanceof NoopMetricsProvider));
+ featureFlags.setClientSideMetricsEnabled((BuiltinMetricsView.getBuiltinViewRegistered()));
 
  // Serialize the web64 encode the bigtable feature flags
  ByteArrayOutputStream boas = new ByteArrayOutputStream();

diff --git a/...able/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/BuiltinMetricsView.java b/...able/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/BuiltinMetricsView.java
@@ -15,6 +15,7 @@
  */
 package com.google.cloud.bigtable.data.v2.stub.metrics;
 
+import com.google.api.core.InternalApi;
 import com.google.auth.Credentials;
 import com.google.auth.oauth2.GoogleCredentials;
 import io.opentelemetry.sdk.metrics.InstrumentSelector;
@@ -24,6 +25,7 @@
 import io.opentelemetry.sdk.metrics.export.PeriodicMetricReader;
 import java.io.IOException;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicBoolean;
 import javax.annotation.Nullable;
 
 /**
@@ -33,6 +35,8 @@
  */
 public class BuiltinMetricsView {
 
+ private static final AtomicBoolean BUILTIN_VIEW_REGISTERED = new AtomicBoolean();
+
  private BuiltinMetricsView() {}
 
  /**
@@ -50,10 +54,20 @@ public static void registerBuiltinMetrics(
  String projectId, @Nullable Credentials credentials, SdkMeterProviderBuilder builder)
  throws IOException {
  MetricExporter metricExporter = BigtableCloudMonitoringExporter.create(projectId, credentials);
+ BUILTIN_VIEW_REGISTERED.set(true);
  for (Map.Entry<InstrumentSelector, View> entry :
  BuiltinMetricsConstants.getAllViews().entrySet()) {
  builder.registerView(entry.getKey(), entry.getValue());
  }
  builder.registerMetricReader(PeriodicMetricReader.create(metricExporter));
  }
+
+ @InternalApi
+ public static boolean getBuiltinViewRegistered() {
+ return BUILTIN_VIEW_REGISTERED.get();
+ }
+
+ static void unregister() {
+ BUILTIN_VIEW_REGISTERED.set(false);
+ }
 }
diff --git a/...ble/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/NoopMetricsProvider.java b/...ble/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/NoopMetricsProvider.java
@@ -27,7 +27,9 @@ public final class NoopMetricsProvider implements MetricsProvider {
 
  public static NoopMetricsProvider INSTANCE = new NoopMetricsProvider();
 
- private NoopMetricsProvider() {}
+ private NoopMetricsProvider() {
+ BuiltinMetricsView.unregister();
+ }
 
  @Override
  public String toString() {