move otel creation to MetricsImpl

Change-Id: Ife3da0fbd1b68e180a579c1fcc8dfc6f9177f58d

Author: igorbernstein2

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

@@ -18,8 +18,11 @@
 import com.google.api.gax.grpc.GaxGrpcProperties;
 import com.google.api.gax.tracing.ApiTracerFactory;
 import com.google.api.gax.tracing.OpencensusTracerFactory;
+import com.google.auth.Credentials;
 import com.google.cloud.bigtable.Version;
+import com.google.cloud.bigtable.data.v2.BigtableDataSettings;
 import com.google.cloud.bigtable.data.v2.internal.csm.attributes.ClientInfo;
+import com.google.cloud.bigtable.data.v2.stub.metrics.BigtableCloudMonitoringExporter;
 import com.google.cloud.bigtable.data.v2.stub.metrics.BuiltinMetricsConstants;
 import com.google.cloud.bigtable.data.v2.stub.metrics.BuiltinMetricsTracerFactory;
 import com.google.cloud.bigtable.data.v2.stub.metrics.ChannelPoolMetricsTracer;
@@ -37,9 +40,18 @@
 import io.opencensus.tags.Tagger;
 import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.sdk.OpenTelemetrySdk;
+import io.opentelemetry.sdk.metrics.InstrumentSelector;
+import io.opentelemetry.sdk.metrics.SdkMeterProvider;
+import io.opentelemetry.sdk.metrics.SdkMeterProviderBuilder;
+import io.opentelemetry.sdk.metrics.View;
+import io.opentelemetry.sdk.metrics.export.MetricExporter;
+import io.opentelemetry.sdk.metrics.export.PeriodicMetricReader;
+import io.opentelemetry.sdk.metrics.export.PeriodicMetricReaderBuilder;
 import java.io.Closeable;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
 import javax.annotation.Nullable;
@@ -135,6 +147,41 @@ public ChannelPoolMetricsTracer getChannelPoolMetricsTracer() {
     return channelPoolMetricsTracer;
   }
 
+  public static OpenTelemetrySdk createBuiltinOtel(
+      ClientInfo clientInfo,
+      @Nullable Credentials defaultCredentials,
+      @Nullable String metricsEndpoint,
+      String universeDomain,
+      ScheduledExecutorService executor)
+      throws IOException {
+
+    Credentials credentials =
+        BigtableDataSettings.getMetricsCredentials() != null
+            ? BigtableDataSettings.getMetricsCredentials()
+            : defaultCredentials;
+
+    SdkMeterProviderBuilder meterProvider = SdkMeterProvider.builder();
+
+    for (Map.Entry<InstrumentSelector, View> entry :
+        BuiltinMetricsConstants.getAllViews().entrySet()) {
+      meterProvider.registerView(entry.getKey(), entry.getValue());
+    }
+
+    for (Map.Entry<InstrumentSelector, View> e :
+        BuiltinMetricsConstants.getInternalViews().entrySet()) {
+      meterProvider.registerView(e.getKey(), e.getValue());
+    }
+
+    MetricExporter publicExporter =
+        BigtableCloudMonitoringExporter.create(
+            clientInfo, credentials, metricsEndpoint, universeDomain, executor);
+    PeriodicMetricReaderBuilder readerBuilder =
+        PeriodicMetricReader.builder(publicExporter).setExecutor(executor);
+    meterProvider.registerMetricReader(readerBuilder.build());
+
+    return OpenTelemetrySdk.builder().setMeterProvider(meterProvider.build()).build();
+  }
+
   private static ApiTracerFactory createOCTracingFactory(ClientInfo clientInfo) {
     return new OpencensusTracerFactory(
         ImmutableMap.<String, String>builder()

google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/BigtableClientContext.java

@@ -32,7 +32,6 @@
 import com.google.cloud.bigtable.data.v2.internal.csm.MetricsImpl;
 import com.google.cloud.bigtable.data.v2.internal.csm.attributes.ClientInfo;
 import com.google.cloud.bigtable.data.v2.stub.metrics.CustomOpenTelemetryMetricsProvider;
-import com.google.cloud.bigtable.data.v2.stub.metrics.Util;
 import com.google.cloud.bigtable.gaxx.grpc.BigtableTransportChannelProvider;
 import com.google.cloud.bigtable.gaxx.grpc.ChannelPrimer;
 import io.grpc.ManagedChannelBuilder;
@@ -113,7 +112,7 @@ public static BigtableClientContext create(
     try {
       if (settings.areInternalMetricsEnabled()) {
         builtinOtel =
-            Util.createBuiltinOtel(
+            MetricsImpl.createBuiltinOtel(
                 clientInfo,
                 credentials,
                 settings.getMetricsEndpoint(),

google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/BigtableCloudMonitoringExporter.java

@@ -113,7 +113,7 @@ public final class BigtableCloudMonitoringExporter implements MetricExporter {
 
   private final AtomicBoolean exportFailureLogged = new AtomicBoolean(false);
 
-  static BigtableCloudMonitoringExporter create(
+  public static BigtableCloudMonitoringExporter create(
       ClientInfo clientInfo,
       @Nullable Credentials credentials,
       @Nullable String endpoint,

google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/Util.java

@@ -19,7 +19,6 @@
 import com.google.api.gax.grpc.GrpcStatusCode;
 import com.google.api.gax.rpc.ApiCallContext;
 import com.google.api.gax.rpc.ApiException;
-import com.google.auth.Credentials;
 import com.google.bigtable.v2.AuthorizedViewName;
 import com.google.bigtable.v2.CheckAndMutateRowRequest;
 import com.google.bigtable.v2.GenerateInitialChangeStreamPartitionsRequest;
@@ -33,21 +32,10 @@
 import com.google.bigtable.v2.ResponseParams;
 import com.google.bigtable.v2.SampleRowKeysRequest;
 import com.google.bigtable.v2.TableName;
-import com.google.cloud.bigtable.data.v2.BigtableDataSettings;
-import com.google.cloud.bigtable.data.v2.internal.csm.attributes.ClientInfo;
 import com.google.cloud.bigtable.data.v2.stub.MetadataExtractorInterceptor;
 import com.google.common.collect.ImmutableMap;
 import io.grpc.Metadata;
 import io.grpc.Status;
-import io.opentelemetry.sdk.OpenTelemetrySdk;
-import io.opentelemetry.sdk.metrics.InstrumentSelector;
-import io.opentelemetry.sdk.metrics.SdkMeterProvider;
-import io.opentelemetry.sdk.metrics.SdkMeterProviderBuilder;
-import io.opentelemetry.sdk.metrics.View;
-import io.opentelemetry.sdk.metrics.export.MetricExporter;
-import io.opentelemetry.sdk.metrics.export.PeriodicMetricReader;
-import io.opentelemetry.sdk.metrics.export.PeriodicMetricReaderBuilder;
-import java.io.IOException;
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
 import java.util.Arrays;
@@ -56,7 +44,6 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.CancellationException;
-import java.util.concurrent.ScheduledExecutorService;
 import javax.annotation.Nullable;
 
 /** Utilities to help integrating with OpenCensus. */
@@ -147,41 +134,6 @@ static Map<String, List<String>> createStatsHeaders(ApiCallContext apiCallContex
     return headers.build();
   }
 
-  public static OpenTelemetrySdk createBuiltinOtel(
-      ClientInfo clientInfo,
-      @Nullable Credentials defaultCredentials,
-      @Nullable String metricsEndpoint,
-      String universeDomain,
-      ScheduledExecutorService executor)
-      throws IOException {
-
-    Credentials credentials =
-        BigtableDataSettings.getMetricsCredentials() != null
-            ? BigtableDataSettings.getMetricsCredentials()
-            : defaultCredentials;
-
-    SdkMeterProviderBuilder meterProvider = SdkMeterProvider.builder();
-
-    for (Map.Entry<InstrumentSelector, View> entry :
-        BuiltinMetricsConstants.getAllViews().entrySet()) {
-      meterProvider.registerView(entry.getKey(), entry.getValue());
-    }
-
-    for (Map.Entry<InstrumentSelector, View> e :
-        BuiltinMetricsConstants.getInternalViews().entrySet()) {
-      meterProvider.registerView(e.getKey(), e.getValue());
-    }
-
-    MetricExporter publicExporter =
-        BigtableCloudMonitoringExporter.create(
-            clientInfo, credentials, metricsEndpoint, universeDomain, executor);
-    PeriodicMetricReaderBuilder readerBuilder =
-        PeriodicMetricReader.builder(publicExporter).setExecutor(executor);
-    meterProvider.registerMetricReader(readerBuilder.build());
-
-    return OpenTelemetrySdk.builder().setMeterProvider(meterProvider.build()).build();
-  }
-
   public static String formatTransportTypeMetricLabel(
       MetadataExtractorInterceptor.SidebandData sidebandData) {
     return Optional.ofNullable(sidebandData)