chore: internalize converters in the exporter

Change-Id: I964a167d2bdb0230eaf2bb0163eb7defc22181a6

Author: igorbernstein2

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

@@ -124,8 +124,7 @@ public static BigtableClientContext create(
       if (settings.areInternalMetricsEnabled()) {
         builtinOtel =
             Util.createBuiltinOtel(
-                InstanceName.of(settings.getProjectId(), settings.getInstanceId()),
-                settings.getAppProfileId(),
+                clientInfo,
                 credentials,
                 settings.getMetricsEndpoint(),
                 universeDomain,

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

@@ -112,10 +112,10 @@ public final class BigtableCloudMonitoringExporter implements MetricExporter {
   private final AtomicBoolean exportFailureLogged = new AtomicBoolean(false);
 
   static BigtableCloudMonitoringExporter create(
+      ClientInfo clientInfo,
       @Nullable Credentials credentials,
       @Nullable String endpoint,
       String universeDomain,
-      List<TimeSeriesConverter> converters,
       @Nullable ScheduledExecutorService executorService)
       throws IOException {
     Preconditions.checkNotNull(universeDomain);
@@ -152,6 +152,13 @@ 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))));
+
     return new BigtableCloudMonitoringExporter(
         MetricServiceClient.create(settingsBuilder.build()), converters);
   }

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

@@ -40,6 +40,7 @@
 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;
 import com.google.cloud.opentelemetry.detection.DetectedPlatform;
 import com.google.cloud.opentelemetry.detection.GCPPlatformDetector;
@@ -182,10 +183,9 @@ static List<TimeSeries> convertToApplicationResourceTimeSeries(
   }
 
   @Nullable
-  static MonitoredResource createInternalMonitoredResource(
-      InstanceName instanceName, String appProfileId) {
+  static MonitoredResource createInternalMonitoredResource(ClientInfo clientInfo) {
     try {
-      MonitoredResource monitoredResource = detectResource(instanceName, appProfileId);
+      MonitoredResource monitoredResource = detectResource(clientInfo);
       logger.log(Level.FINE, "Internal metrics monitored resource: %s", monitoredResource);
       return monitoredResource;
     } catch (Exception e) {
@@ -198,7 +198,7 @@ static MonitoredResource createInternalMonitoredResource(
   }
 
   @Nullable
-  private static MonitoredResource detectResource(InstanceName instanceName, String appProfileId) {
+  private static MonitoredResource detectResource(ClientInfo clientInfo) {
     GCPPlatformDetector detector = GCPPlatformDetector.DEFAULT_INSTANCE;
     DetectedPlatform detectedPlatform = detector.detectPlatform();
 
@@ -245,9 +245,9 @@ private static MonitoredResource detectResource(InstanceName instanceName, Strin
 
     return MonitoredResource.newBuilder()
         .setType("bigtable_client")
-        .putLabels("project_id", instanceName.getProject())
-        .putLabels("instance", instanceName.getInstance())
-        .putLabels("app_profile", appProfileId)
+        .putLabels("project_id", clientInfo.getInstanceName().getProject())
+        .putLabels("instance", clientInfo.getInstanceName().getInstance())
+        .putLabels("app_profile", clientInfo.getAppProfileId())
         .putLabels("client_project", detectedPlatform.getProjectId())
         .putLabels("region", region)
         .putLabels("cloud_platform", cloud_platform)

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

@@ -274,7 +274,9 @@ public static ApiTracerFactory createOCMetricsFactory(
   }
 
   public static BuiltinMetricsTracerFactory createOtelMetricsFactory(
-      OpenTelemetry otel, ClientInfo clientInfo) {
-    return new BuiltinMetricsTracerFactory(otel, clientInfo);
+      OpenTelemetry otel, ClientInfo clientInfo) throws IOException {
+
+
+    return BuiltinMetricsTracerFactory.create(otel, clientInfo);
   }
 }