format

Change-Id: I9c8a10c98cef7fcea8b523e1a3cc4a93567677a7

Author: igorbernstein2

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

@@ -39,11 +39,13 @@
 import com.google.api.gax.core.NoCredentialsProvider;
 import com.google.api.gax.rpc.PermissionDeniedException;
 import com.google.auth.Credentials;
+import com.google.cloud.bigtable.data.v2.internal.csm.attributes.ClientInfo;
 import com.google.cloud.monitoring.v3.MetricServiceClient;
 import com.google.cloud.monitoring.v3.MetricServiceSettings;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Supplier;
+import com.google.common.base.Suppliers;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
@@ -152,12 +154,12 @@ static BigtableCloudMonitoringExporter create(
     // it as not retried for now.
     settingsBuilder.createServiceTimeSeriesSettings().setSimpleTimeoutNoRetriesDuration(timeout);
 
-    ImmutableList<TimeSeriesConverter> converters = ImmutableList.of(
-        new PublicTimeSeriesConverter(),
-        new InternalTimeSeriesConverter(
-            Suppliers.memoize(
-                () ->
-                    BigtableExporterUtils.createInternalMonitoredResource(clientInfo))));
+    ImmutableList<TimeSeriesConverter> converters =
+        ImmutableList.of(
+            new PublicTimeSeriesConverter(),
+            new InternalTimeSeriesConverter(
+                Suppliers.memoize(
+                    () -> BigtableExporterUtils.createInternalMonitoredResource(clientInfo))));
 
     return new BigtableCloudMonitoringExporter(
         MetricServiceClient.create(settingsBuilder.build()), converters);

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

@@ -38,7 +38,6 @@
 import com.google.api.Distribution;
 import com.google.api.Metric;
 import com.google.api.MonitoredResource;
-import com.google.bigtable.v2.InstanceName;
 import com.google.cloud.bigtable.Version;
 import com.google.cloud.bigtable.data.v2.internal.csm.attributes.ClientInfo;
 import com.google.cloud.opentelemetry.detection.AttributeKeys;

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

@@ -27,7 +27,6 @@
 import com.google.bigtable.v2.AuthorizedViewName;
 import com.google.bigtable.v2.CheckAndMutateRowRequest;
 import com.google.bigtable.v2.GenerateInitialChangeStreamPartitionsRequest;
-import com.google.bigtable.v2.InstanceName;
 import com.google.bigtable.v2.MaterializedViewName;
 import com.google.bigtable.v2.MutateRowRequest;
 import com.google.bigtable.v2.MutateRowsRequest;
@@ -42,8 +41,6 @@
 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.base.Suppliers;
-import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import io.grpc.Metadata;
 import io.grpc.Status;
@@ -162,8 +159,7 @@ static Map<String, List<String>> createStatsHeaders(ApiCallContext apiCallContex
   }
 
   public static OpenTelemetrySdk createBuiltinOtel(
-      InstanceName instanceName,
-      String appProfileId,
+      ClientInfo clientInfo,
       @Nullable Credentials defaultCredentials,
       @Nullable String metricsEndpoint,
       String universeDomain,
@@ -189,17 +185,7 @@ public static OpenTelemetrySdk createBuiltinOtel(
 
     MetricExporter publicExporter =
         BigtableCloudMonitoringExporter.create(
-            credentials,
-            metricsEndpoint,
-            universeDomain,
-            ImmutableList.of(
-                new BigtableCloudMonitoringExporter.PublicTimeSeriesConverter(),
-                new BigtableCloudMonitoringExporter.InternalTimeSeriesConverter(
-                    Suppliers.memoize(
-                        () ->
-                            BigtableExporterUtils.createInternalMonitoredResource(
-                                instanceName, appProfileId)))),
-            executor);
+            clientInfo, credentials, metricsEndpoint, universeDomain, executor);
     PeriodicMetricReaderBuilder readerBuilder =
         PeriodicMetricReader.builder(publicExporter).setExecutor(executor);
     meterProvider.registerMetricReader(readerBuilder.build());
@@ -276,7 +262,6 @@ public static ApiTracerFactory createOCMetricsFactory(
   public static BuiltinMetricsTracerFactory createOtelMetricsFactory(
       OpenTelemetry otel, ClientInfo clientInfo) throws IOException {
 
-
     return BuiltinMetricsTracerFactory.create(otel, clientInfo);
   }
 }