chore: Clean up PR

Author: lqiu96

java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/telemetry/BuiltInDatastoreMetricsProvider.java

@@ -50,8 +50,7 @@
  */
 class BuiltInDatastoreMetricsProvider {
 
-  public static final BuiltInDatastoreMetricsProvider INSTANCE =
-      new BuiltInDatastoreMetricsProvider();
+  static final BuiltInDatastoreMetricsProvider INSTANCE = new BuiltInDatastoreMetricsProvider();
 
   private static final Logger logger =
       Logger.getLogger(BuiltInDatastoreMetricsProvider.class.getName());

java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/telemetry/DatastoreCloudMonitoringExporter.java

@@ -124,9 +124,9 @@ static class CachedMetricsClient {
    * responses and can mask the real failure reason.
    *
    * <p>{@code createTimeSeries} is used instead of {@code createServiceTimeSeries} because the
-   * Firestore namespace in Cloud Monitoring has not yet been deployed as a service resource. Once
-   * the namespace is available, this should be migrated to {@code createServiceTimeSeries} for
-   * correct quota and resource attribution.
+   * Firestore namespace in Cloud Monitoring (b/405457573) has not yet been deployed as a service
+   * resource. Once the namespace is available, this should be migrated to {@code
+   * createServiceTimeSeries} for correct quota and resource attribution.
    *
    * @param projectId the GCP project ID where metrics will be exported.
    * @param credentials the credentials used to authenticate with Cloud Monitoring.

java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/telemetry/DatastoreCloudMonitoringExporterUtils.java

@@ -84,25 +84,27 @@ static List<TimeSeries> convertToDatastoreTimeSeries(
 
     // Metrics should already been filtered for Gax and Datastore related ones
     for (MetricData metricData : collection) {
+      // TODO(b/405457573): The monitored resource is currently written to `global` because the
+      // Firestore
+      // namespace in Cloud Monitoring has not been deployed yet. Once the namespace is available,
+      // database_id and location labels should be added here using RESOURCE_LABEL_DATABASE_ID
+      // and RESOURCE_LABEL_LOCATION respectively.
+
       // Map OTel resource attributes to the specific monitored resource labels.
       MonitoredResource.Builder monitoredResourceBuilder =
           MonitoredResource.newBuilder().setType(DATASTORE_RESOURCE_TYPE);
 
       Attributes resourceAttributes = metricData.getResource().getAttributes();
       String resourceProjectId = resourceAttributes.get(TelemetryConstants.PROJECT_ID_KEY);
-      String resourceDatabaseId = resourceAttributes.get(TelemetryConstants.DATABASE_ID_KEY);
-      String resourceLocation = resourceAttributes.get(TelemetryConstants.LOCATION_ID_KEY);
+      //      String resourceDatabaseId =
+      // resourceAttributes.get(TelemetryConstants.DATABASE_ID_KEY);
+      //      String resourceLocation = resourceAttributes.get(TelemetryConstants.LOCATION_ID_KEY);
 
       if (resourceProjectId != null) {
         monitoredResourceBuilder.putLabels(
             TelemetryConstants.RESOURCE_LABEL_PROJECT_ID, resourceProjectId);
       }
 
-      // TODO: The monitored resource is currently written to `global` because the Datastore
-      // namespace in Cloud Monitoring has not been deployed yet. Once the namespace is available,
-      // database_id and location labels should be added here using RESOURCE_LABEL_DATABASE_ID
-      // and RESOURCE_LABEL_LOCATION respectively.
-
       // Convert each point in the metric data to a TimeSeries.
       metricData.getData().getPoints().stream()
           .map(

java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/telemetry/TelemetryConstants.java

@@ -33,8 +33,8 @@
 @InternalApi
 public class TelemetryConstants {
 
-  // The Firestore namespace has not been deployed yet. Must target the custom namespace
-  // until this is implemented.
+  // TODO(b/405457573): The Firestore namespace has not been deployed yet. Must target the
+  // custom namespace until this is implemented.
   public static final String METRIC_PREFIX = "custom.googleapis.com/internal/client";
   public static final String DATASTORE_METER_NAME = "java-datastore";
 
@@ -63,17 +63,16 @@ public class TelemetryConstants {
   // GAX-emitted metrics for the built-in Cloud Monitoring export pipeline.
   public static final Set<String> GAX_METRICS = GAX_METRIC_NAME_MAP.keySet();
 
-  // The subset of GAX_METRICS that are histograms (latency metrics). Explicit enumeration here
-  // avoids fragile name-suffix matching (endsWith("latency")) in view registration logic.
+  // The subset of GAX_METRICS that are histograms (e.g. latency metrics)
   public static final Set<String> GAX_HISTOGRAM_METRICS =
       ImmutableSet.of(METRIC_NAME_SHORT_OPERATION_LATENCY, METRIC_NAME_SHORT_ATTEMPT_LATENCY);
 
   // Monitored resource type for Cloud Monitoring
   public static final String DATASTORE_RESOURCE_TYPE = "global";
 
   // Resource label keys for the monitored resource
-  // The Firestore namespace has not been deployed yet. Must target the global
-  // Monitored Resource until this is implemented.
+  // TODO(b/405457573): The Firestore namespace has not been deployed yet. Must
+  // target the global Monitored Resource until this is implemented.
   public static final String RESOURCE_LABEL_PROJECT_ID = "project_id";
   public static final String RESOURCE_LABEL_DATABASE_ID = "database_id";
   public static final String RESOURCE_LABEL_LOCATION = "location";