chore: refactor metrics to be more structured and typesafe

Change-Id: I8573fdaf6d78398fdcad9a1c2cda16445f897276

# Conflicts:
#	google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/internal/csm/MetricRegistry.java
#	google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/internal/csm/attributes/ClientInfo.java
#	google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/internal/csm/metrics/ClientPerConnectionErrorCount.java
#	google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/internal/csm/metrics/Constants.java
#	google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/internal/csm/metrics/PacemakerDelay.java
#	google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/internal/csm/metrics/TableApplicationBlockingLatency.java
#	google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/internal/csm/metrics/TableAttemptLatency.java
#	google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/internal/csm/metrics/TableAttemptLatency2.java
#	google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/internal/csm/metrics/TableClientBlockingLatency.java
#	google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/internal/csm/metrics/TableConnectivityErrorCount.java
#	google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/internal/csm/metrics/TableDebugTagCount.java
#	google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/internal/csm/metrics/TableFirstResponseLatency.java
#	google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/internal/csm/metrics/TableOperationLatency.java
#	google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/internal/csm/metrics/TableRemainingDeadline.java
#	google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/internal/csm/metrics/TableRetryCount.java
#	google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/internal/csm/metrics/TableServerLatency.java
#	google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/internal/csm/schema/ClientSchema.java
#	google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/internal/csm/schema/TableSchema.java
#	google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/internal/csm/attributes/ClientInfoTest.java

Author: igorbernstein2

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

@@ -109,7 +109,8 @@ public BigtableDataClient createDefault() {
     try {
       BigtableClientContext ctx =
           sharedClientContext.createChild(
-              sharedClientContext.getInstanceName(), sharedClientContext.getAppProfileId());
+              sharedClientContext.getClientInfo().getInstanceName(),
+              sharedClientContext.getClientInfo().getAppProfileId());
 
       return new BigtableDataClient(new EnhancedBigtableStub(perOpSettings, ctx));
     } catch (IOException e) {
@@ -130,7 +131,7 @@ public BigtableDataClient createDefault() {
    */
   public BigtableDataClient createForAppProfile(@Nonnull String appProfileId) throws IOException {
     BigtableClientContext ctx =
-        sharedClientContext.createChild(sharedClientContext.getInstanceName(), appProfileId);
+        sharedClientContext.createChild(sharedClientContext.getClientInfo().getInstanceName(), appProfileId);
 
     return new BigtableDataClient(new EnhancedBigtableStub(perOpSettings, ctx));
   }

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

@@ -29,6 +29,7 @@
 import com.google.auth.oauth2.ServiceAccountJwtAccessCredentials;
 import com.google.bigtable.v2.InstanceName;
 import com.google.cloud.bigtable.data.v2.internal.JwtCredentialsWithAudience;
+import com.google.cloud.bigtable.data.v2.internal.csm.attributes.ClientInfo;
 import com.google.cloud.bigtable.data.v2.stub.metrics.BuiltinMetricsConstants;
 import com.google.cloud.bigtable.data.v2.stub.metrics.ChannelPoolMetricsTracer;
 import com.google.cloud.bigtable.data.v2.stub.metrics.CompositeTracerFactory;
@@ -63,8 +64,7 @@ public class BigtableClientContext {
   private static final Logger logger = Logger.getLogger(BigtableClientContext.class.getName());
 
   private final boolean isChild;
-  private final InstanceName instanceName;
-  private final String appProfileId;
+  private final ClientInfo clientInfo;
   private final ApiTracerFactory userTracerFactory;
   @Nullable private final OpenTelemetrySdk builtinOpenTelemetry;
   @Nullable private final OpenTelemetry userOpenTelemetry;
@@ -83,8 +83,11 @@ public static BigtableClientContext create(EnhancedBigtableStubSettings settings
   public static BigtableClientContext create(
       EnhancedBigtableStubSettings settings, Tagger ocTagger, StatsRecorder ocRecorder)
       throws IOException {
-    InstanceName instanceName = InstanceName.of(settings.getProjectId(), settings.getInstanceId());
-    String appProfileId = settings.getAppProfileId();
+
+    ClientInfo clientInfo = ClientInfo.builder()
+        .setInstanceName(InstanceName.of(settings.getProjectId(), settings.getInstanceId()))
+        .setAppProfileId(settings.getAppProfileId())
+        .build();
 
     EnhancedBigtableStubSettings.Builder builder = settings.toBuilder();
 
@@ -184,8 +187,7 @@ public static BigtableClientContext create(
 
     return new BigtableClientContext(
         false,
-        instanceName,
-        appProfileId,
+        clientInfo,
         clientContext,
         userTracerFactory,
         builtinOtel,
@@ -224,8 +226,7 @@ private static void configureGrpcOtel(
 
   private BigtableClientContext(
       boolean isChild,
-      InstanceName instanceName,
-      String appProfileId,
+      ClientInfo clientInfo,
       ClientContext clientContext,
       ApiTracerFactory userTracerFactory,
       @Nullable OpenTelemetrySdk builtinOtel,
@@ -235,8 +236,7 @@ private BigtableClientContext(
       ExecutorProvider backgroundExecutorProvider)
       throws IOException {
     this.isChild = isChild;
-    this.instanceName = instanceName;
-    this.appProfileId = appProfileId;
+    this.clientInfo = clientInfo;
 
     this.userTracerFactory = userTracerFactory;
     this.builtinOpenTelemetry = builtinOtel;
@@ -247,15 +247,15 @@ private BigtableClientContext(
 
     ImmutableList.Builder<ApiTracerFactory> tracerFactories = ImmutableList.builder();
     tracerFactories
-        .add(Util.createOCTracingFactory(instanceName, appProfileId))
-        .add(Util.createOCMetricsFactory(instanceName, appProfileId, ocTagger, ocRecorder))
+        .add(Util.createOCTracingFactory(clientInfo))
+        .add(Util.createOCMetricsFactory(clientInfo, ocTagger, ocRecorder))
         .add(userTracerFactory);
 
     if (builtinOtel != null) {
-      tracerFactories.add(Util.createOtelMetricsFactory(builtinOtel, instanceName, appProfileId));
+      tracerFactories.add(Util.createOtelMetricsFactory(builtinOtel, clientInfo));
     }
     if (userOtel != null) {
-      tracerFactories.add(Util.createOtelMetricsFactory(userOtel, instanceName, appProfileId));
+      tracerFactories.add(Util.createOtelMetricsFactory(userOtel, clientInfo));
     }
 
     this.clientContext =
@@ -264,12 +264,8 @@ private BigtableClientContext(
             .build();
   }
 
-  public InstanceName getInstanceName() {
-    return instanceName;
-  }
-
-  public String getAppProfileId() {
-    return appProfileId;
+  public ClientInfo getClientInfo() {
+    return clientInfo;
   }
 
   @Nullable
@@ -290,8 +286,10 @@ public BigtableClientContext createChild(InstanceName instanceName, String appPr
       throws IOException {
     return new BigtableClientContext(
         true,
-        instanceName,
-        appProfileId,
+        clientInfo.toBuilder()
+            .setInstanceName(instanceName)
+            .setAppProfileId(appProfileId)
+            .build(),
         clientContext,
         userTracerFactory,
         builtinOpenTelemetry,

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

@@ -184,9 +184,9 @@ public EnhancedBigtableStub(
     this.bigtableClientContext = clientContext;
     this.requestContext =
         RequestContext.create(
-            clientContext.getInstanceName().getProject(),
-            clientContext.getInstanceName().getInstance(),
-            clientContext.getAppProfileId());
+            clientContext.getClientInfo().getInstanceName().getProject(),
+            clientContext.getClientInfo().getInstanceName().getInstance(),
+            clientContext.getClientInfo().getAppProfileId());
     this.bulkMutationFlowController =
         new FlowController(perOpSettings.bulkMutateRowsSettings.getDynamicFlowControlSettings());
     this.bulkMutationDynamicFlowControlStats = new DynamicFlowControlStats();