resolve comments

google-cloud-firestore/src/main/java/com/google/cloud/firestore/FirestoreOpenTelemetryOptions.java

@@ -28,23 +28,17 @@
 @BetaApi
 public class FirestoreOpenTelemetryOptions {
   private final boolean tracingEnabled;
-  private final boolean metricsEnabled;
   private final @Nullable OpenTelemetry openTelemetry;
 
   FirestoreOpenTelemetryOptions(Builder builder) {
     this.tracingEnabled = builder.tracingEnabled;
-    this.metricsEnabled = builder.metricsEnabled;
     this.openTelemetry = builder.openTelemetry;
   }
 
   public boolean isTracingEnabled() {
     return tracingEnabled;
   }
 
-  public boolean isMetricsEnabled() {
-    return metricsEnabled;
-  }
-
   public OpenTelemetry getOpenTelemetry() {
     return openTelemetry;
   }
@@ -63,20 +57,15 @@ public static class Builder {
 
     private boolean tracingEnabled;
 
-    private boolean metricsEnabled;
-
     @Nullable private OpenTelemetry openTelemetry;
 
     private Builder() {
       tracingEnabled = false;
-      // TODO(metrics): set this to default on
-      metricsEnabled = false;
       openTelemetry = null;
     }
 
     private Builder(FirestoreOpenTelemetryOptions options) {
       this.tracingEnabled = options.tracingEnabled;
-      this.metricsEnabled = options.metricsEnabled;
       this.openTelemetry = options.openTelemetry;
     }
 
@@ -96,18 +85,6 @@ public FirestoreOpenTelemetryOptions.Builder setTracingEnabled(boolean tracingEn
       return this;
     }
 
-    /**
-     * Sets whether client side metrics should be enabled.
-     *
-     * @param metricsEnabled Whether client side metrics should be enabled.
-     */
-    // TODO: change this to public when the feature is ready
-    @Nonnull
-    private FirestoreOpenTelemetryOptions.Builder setMetricsEnabled(boolean metricsEnabled) {
-      this.metricsEnabled = metricsEnabled;
-      return this;
-    }
-
     /**
      * Sets the {@link OpenTelemetry} to use with this Firestore instance. If telemetry collection
      * is enabled, but an `OpenTelemetry` is not provided, the Firestore SDK will attempt to use the

google-cloud-firestore/src/main/java/com/google/cloud/firestore/FirestoreOptions.java

@@ -31,6 +31,7 @@
 import com.google.cloud.TransportOptions;
 import com.google.cloud.firestore.spi.v1.FirestoreRpc;
 import com.google.cloud.firestore.spi.v1.GrpcFirestoreRpc;
+import com.google.cloud.firestore.telemetry.CompositeApiTracerFactory;
 import com.google.cloud.firestore.telemetry.MetricsUtil;
 import com.google.cloud.firestore.v1.FirestoreSettings;
 import com.google.cloud.grpc.GrpcTransportOptions;
@@ -110,18 +111,15 @@ protected String getDefaultHost() {
     return FirestoreDefaults.INSTANCE.getHost();
   }
 
+  @InternalApi
   @Override
   public ApiTracerFactory getApiTracerFactory() {
-    return createApiTracerFactory();
-  }
-
-  private ApiTracerFactory createApiTracerFactory() {
     List<ApiTracerFactory> apiTracerFactories = new ArrayList<>();
     // Prefer any direct ApiTracerFactory that might have been set on the builder.
     if (super.getApiTracerFactory() != null) {
       apiTracerFactories.add(super.getApiTracerFactory());
     }
-    // Add Metrics Tracer factory if built in metrics are enabled.
+    // Add Metrics Tracer factory if built-in metrics are enabled.
     metricsUtil.addMetricsTracerFactory(apiTracerFactories);
 
     if (apiTracerFactories.isEmpty()) {
@@ -152,7 +150,7 @@ com.google.cloud.firestore.telemetry.TraceUtil getTraceUtil() {
   }
 
   @Nonnull
-  public com.google.cloud.firestore.telemetry.MetricsUtil getMetricsUtil() {
+  com.google.cloud.firestore.telemetry.MetricsUtil getMetricsUtil() {
     return metricsUtil;
   }
 
@@ -354,7 +352,7 @@ protected FirestoreOptions(Builder builder) {
             ? builder.databaseId
             : FirestoreDefaults.INSTANCE.getDatabaseId();
 
-    // set metrics util after database ID is set
+    // Set up the `MetricsUtil` instance after the database ID has been set.
     this.metricsUtil = MetricsUtil.getInstance(this);
 
     if (builder.channelProvider == null) {

google-cloud-firestore/src/main/java/com/google/cloud/firestore/telemetry/BuiltinMetricsProvider.java

@@ -17,9 +17,9 @@
 package com.google.cloud.firestore.telemetry;
 
 import static com.google.cloud.firestore.telemetry.TelemetryConstants.FIRESTORE_METER_NAME;
-import static com.google.cloud.firestore.telemetry.TelemetryConstants.METRIC_KEY_CLIENT_UID;
-import static com.google.cloud.firestore.telemetry.TelemetryConstants.METRIC_KEY_LIBRARY_NAME;
-import static com.google.cloud.firestore.telemetry.TelemetryConstants.METRIC_KEY_LIBRARY_VERSION;
+import static com.google.cloud.firestore.telemetry.TelemetryConstants.METRIC_ATTRIBUTE_KEY_CLIENT_UID;
+import static com.google.cloud.firestore.telemetry.TelemetryConstants.METRIC_ATTRIBUTE_KEY_LIBRARY_NAME;
+import static com.google.cloud.firestore.telemetry.TelemetryConstants.METRIC_ATTRIBUTE_KEY_LIBRARY_VERSION;
 import static com.google.cloud.firestore.telemetry.TelemetryConstants.METRIC_NAME_END_TO_END_LATENCY;
 import static com.google.cloud.firestore.telemetry.TelemetryConstants.METRIC_NAME_FIRST_RESPONSE_LATENCY;
 import static com.google.cloud.firestore.telemetry.TelemetryConstants.METRIC_PREFIX;
@@ -50,7 +50,7 @@ class BuiltinMetricsProvider {
   private final Map<String, String> staticAttributes;
 
   private static final String MILLISECOND_UNIT = "ms";
-  private static final String FIRESTORE_LIBRARY_NAME = "java_firestore";
+  private static final String FIRESTORE_LIBRARY_NAME = "com.google.cloud.firestore";
 
   public BuiltinMetricsProvider(OpenTelemetry openTelemetry) {
     this.openTelemetry = openTelemetry;
@@ -111,11 +111,11 @@ private void configureSDKLayerMetrics() {
 
   private Map<String, String> createStaticAttributes() {
     Map<String, String> staticAttributes = new HashMap<>();
-    staticAttributes.put(METRIC_KEY_CLIENT_UID.getKey(), ClientIdentifier.getClientUid());
-    staticAttributes.put(METRIC_KEY_LIBRARY_NAME.getKey(), FIRESTORE_LIBRARY_NAME);
+    staticAttributes.put(METRIC_ATTRIBUTE_KEY_CLIENT_UID.getKey(), ClientIdentifier.getClientUid());
+    staticAttributes.put(METRIC_ATTRIBUTE_KEY_LIBRARY_NAME.getKey(), FIRESTORE_LIBRARY_NAME);
     String pkgVersion = this.getClass().getPackage().getImplementationVersion();
     if (pkgVersion != null) {
-      staticAttributes.put(METRIC_KEY_LIBRARY_VERSION.getKey(), pkgVersion);
+      staticAttributes.put(METRIC_ATTRIBUTE_KEY_LIBRARY_VERSION.getKey(), pkgVersion);
     }
     return staticAttributes;
   }

google-cloud-firestore/src/main/java/com/google/cloud/firestore/telemetry/ClientIdentifier.java

@@ -19,7 +19,6 @@
 import java.lang.management.ManagementFactory;
 import java.lang.reflect.Method;
 import java.net.InetAddress;
-import java.net.UnknownHostException;
 import java.util.UUID;
 
 /** A utility class for retrieving a unique client identifier (CLIENT_UID) */
@@ -51,7 +50,7 @@ private static String generateClientUid() {
   private static String getHostName() {
     try {
       return InetAddress.getLocalHost().getHostName();
-    } catch (UnknownHostException e) {
+    } catch (Exception e) {
       return "localhost";
     }
   }