chore: Clean up the code

Author: lqiu96

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

@@ -131,7 +131,7 @@ public OpenTelemetry createOpenTelemetry(
    *
    * @return the detected location, or "global" if detection fails.
    */
-  public String detectClientLocation() {
+  String detectClientLocation() {
     if (location == null) {
       location = "global";
     }

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

@@ -39,41 +39,47 @@ class CompositeDatastoreMetricsRecorder implements DatastoreMetricsRecorder {
     this.recorders = recorders;
   }
 
+  /** {@inheritDoc} */
   @Override
   public void recordTransactionLatency(double latencyMs, Map<String, String> attributes) {
     for (DatastoreMetricsRecorder recorder : recorders) {
       recorder.recordTransactionLatency(latencyMs, attributes);
     }
   }
 
+  /** {@inheritDoc} */
   @Override
   public void recordTransactionAttemptCount(long count, Map<String, String> attributes) {
     for (DatastoreMetricsRecorder recorder : recorders) {
       recorder.recordTransactionAttemptCount(count, attributes);
     }
   }
 
+  /** {@inheritDoc} */
   @Override
   public void recordAttemptLatency(double latencyMs, Map<String, String> attributes) {
     for (DatastoreMetricsRecorder recorder : recorders) {
       recorder.recordAttemptLatency(latencyMs, attributes);
     }
   }
 
+  /** {@inheritDoc} */
   @Override
   public void recordAttemptCount(long count, Map<String, String> attributes) {
     for (DatastoreMetricsRecorder recorder : recorders) {
       recorder.recordAttemptCount(count, attributes);
     }
   }
 
+  /** {@inheritDoc} */
   @Override
   public void recordOperationLatency(double latencyMs, Map<String, String> attributes) {
     for (DatastoreMetricsRecorder recorder : recorders) {
       recorder.recordOperationLatency(latencyMs, attributes);
     }
   }
 
+  /** {@inheritDoc} */
   @Override
   public void recordOperationCount(long count, Map<String, String> attributes) {
     for (DatastoreMetricsRecorder recorder : recorders) {

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

@@ -71,13 +71,14 @@ private DatastoreBuiltInMetricsView() {}
    * <p>This method acts as the central configuration point for the metrics pipeline, stitching
    * together the recording (SDK), the processing (Views), and the delivery (Exporter).
    *
+   * <p>Views are scoped to the SdkMeterProvider they are registered on. This method is called
+   * exclusively from BuiltInDatastoreMetricsProvider, which constructs a private SdkMeterProvider
+   * for the built-in Cloud Monitoring export path. A user-provided OpenTelemetry instance has its
+   * own independent MeterProvider, so these views never affect user-configured backends.
+   *
    * @param metricExporter the exporter to use for metrics.
    * @param builder the builder to register views and the {@link PeriodicMetricReader} on.
    */
-  // Views are scoped to the SdkMeterProvider they are registered on. This method is called
-  // exclusively from BuiltInDatastoreMetricsProvider, which constructs a private SdkMeterProvider
-  // for the built-in Cloud Monitoring export path. A user-provided OpenTelemetry instance has its
-  // own independent MeterProvider, so these views never affect user-configured backends.
   static void registerBuiltinMetrics(
       MetricExporter metricExporter, SdkMeterProviderBuilder builder) {
     registerGaxViews(builder);

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

@@ -85,10 +85,9 @@ 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.
+      // 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 =

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

@@ -66,6 +66,12 @@ class OpenTelemetryDatastoreMetricsRecorder extends OpenTelemetryMetricsRecorder
   /**
    * Creates a recorder, specifying whether this instance owns the {@link OpenTelemetry} lifecycle.
    *
+   * <p>Note: Standard GAX RPC metrics (operation_latency, attempt_latency, etc.) are handled by the
+   * base OpenTelemetryMetricsRecorder class. Those metrics are inherited from the parent classes.
+   * However, the internal metrics expect plural suffixes (e.g. `latencies` instead of `latency`).
+   * The discrepancy between the singular GAX names and the plural internal Cloud Monitoring names
+   * is handled by configuring OpenTelemetry Views.
+   *
    * @param isBuiltIn {@code true} if this recorder created the instance and should shut it down on
    *     {@link #close()}; {@code false} if the user provided it.
    */
@@ -75,12 +81,6 @@ class OpenTelemetryDatastoreMetricsRecorder extends OpenTelemetryMetricsRecorder
     this.openTelemetry = openTelemetry;
     this.isBuiltIn = isBuiltIn;
 
-    // Note: Standard GAX RPC metrics (operation_latency, attempt_latency, etc.) are handled by the
-    // base OpenTelemetryMetricsRecorder class. Those metrics are inherited from the parent classes.
-    // However, the internal metrics expect plural suffixes (e.g. `latencies` instead of `latency`).
-    // The discrepancy between the singular GAX names and the plural internal Cloud Monitoring names
-    // is handled by configuring OpenTelemetry Views.
-
     Meter meter = openTelemetry.getMeter(TelemetryConstants.DATASTORE_METER_NAME);
 
     this.transactionLatency =

java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreOptionsTest.java

@@ -25,6 +25,7 @@
 
 import com.google.api.gax.grpc.ChannelPoolSettings;
 import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
+import com.google.auth.Credentials;
 import com.google.cloud.NoCredentials;
 import com.google.cloud.datastore.spi.DatastoreRpcFactory;
 import com.google.cloud.datastore.spi.v1.DatastoreRpc;
@@ -321,10 +322,17 @@ public void builtInMetricsExport_isDisabledByDefault() {
 
   @Test
   public void bothBackendsActive_recorderIsComposite() {
+    Credentials credentials = EasyMock.createMock(Credentials.class);
+    EasyMock.expect(credentials.getMetricsCredentialType())
+        .andReturn(com.google.auth.CredentialTypeForMetrics.DO_NOT_SEND)
+        .anyTimes();
+    EasyMock.replay(credentials);
+
     DatastoreOptions options =
         DatastoreOptions.newBuilder()
             .setProjectId(PROJECT_ID)
             .setDatabaseId(DATABASE_ID)
+            .setCredentials(credentials)
             .setOpenTelemetryOptions(
                 DatastoreOpenTelemetryOptions.newBuilder()
                     .setMetricsEnabled(true)