chore: Clean up code based on PR feedback

Author: lqiu96

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

@@ -43,6 +43,8 @@
 @InternalExtensionOnly
 public interface DatastoreMetricsRecorder extends MetricsRecorder {
 
+  Logger logger = Logger.getLogger(DatastoreMetricsRecorder.class.getName());
+
   /**
    * Releases any resources held by this recorder.
    *
@@ -85,16 +87,21 @@ default void close() {}
    */
   static DatastoreMetricsRecorder getInstance(
       @Nonnull DatastoreOptions options, OpenTelemetry builtInOtel) {
-    Logger logger = Logger.getLogger(DatastoreMetricsRecorder.class.getName());
-    DatastoreOpenTelemetryOptions otelOptions = options.getOpenTelemetryOptions();
     List<DatastoreMetricsRecorder> recorders = new ArrayList<>();
 
-    // Default provider: export built-in metrics to Cloud Monitoring
+    // No need to send metrics when using an emulator
     String emulatorHost = System.getenv(DatastoreOptions.LOCAL_HOST_ENV_VAR);
     boolean emulatorEnabled = emulatorHost != null && !emulatorHost.isEmpty();
 
+    if (emulatorEnabled) {
+      logger.log(Level.FINE, "Emulator detected in Datastore. Metrics are not being recorded.");
+      return new CompositeDatastoreMetricsRecorder(recorders);
+    }
+
+    DatastoreOpenTelemetryOptions otelOptions = options.getOpenTelemetryOptions();
+
     // When using a local emulator, there is no need to configure a built-in Otel instance
-    if (otelOptions.isExportBuiltinMetricsToGoogleCloudMonitoring() && !emulatorEnabled) {
+    if (otelOptions.isExportBuiltinMetricsToGoogleCloudMonitoring()) {
       try {
         if (builtInOtel != null) {
           recorders.add(
@@ -104,7 +111,7 @@ static DatastoreMetricsRecorder getInstance(
       } catch (Exception e) {
         logger.log(
             Level.WARNING,
-            "Failed to create built-in metrics provider for Cloud Monitoring export.",
+            "Failed to create built-in metrics provider for Cloud Monitoring exporting.",
             e);
       }
     }
@@ -113,7 +120,7 @@ static DatastoreMetricsRecorder getInstance(
     // configured backend. We will first check their supplied Otel object, then check
     // the global Otel config.
     // Note: Metrics will not be sent if an emulator is enabled.
-    if (otelOptions.isMetricsEnabled() && !emulatorEnabled) {
+    if (otelOptions.isMetricsEnabled()) {
       OpenTelemetry customOtel = otelOptions.getOpenTelemetry();
       if (customOtel == null) {
         customOtel = GlobalOpenTelemetry.get();

java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/telemetry/DatastoreMetricsRecorderTest.java

@@ -21,9 +21,7 @@
 import com.google.cloud.datastore.DatastoreOpenTelemetryOptions;
 import com.google.cloud.datastore.DatastoreOptions;
 import io.opentelemetry.api.OpenTelemetry;
-import io.opentelemetry.sdk.OpenTelemetrySdk;
-import io.opentelemetry.sdk.metrics.SdkMeterProvider;
-import io.opentelemetry.sdk.testing.exporter.InMemoryMetricReader;
+import org.easymock.EasyMock;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -51,8 +49,8 @@ public void defaultOptionsWithBuiltInMetricsDisabled_returnsNoRecorders() {
                     .setExportBuiltinMetricsToGoogleCloudMonitoring(false)
                     .build())
             .build();
-    OpenTelemetry builtInOtel = org.easymock.EasyMock.createMock(OpenTelemetry.class);
-    org.easymock.EasyMock.replay(builtInOtel);
+    OpenTelemetry builtInOtel = EasyMock.createMock(OpenTelemetry.class);
+    EasyMock.replay(builtInOtel);
     DatastoreMetricsRecorder recorder = DatastoreMetricsRecorder.getInstance(options, builtInOtel);
     assertThat(recorder).isInstanceOf(CompositeDatastoreMetricsRecorder.class);
     CompositeDatastoreMetricsRecorder compositeRecorder =
@@ -71,8 +69,8 @@ public void tracingEnabledButMetricsDisabledAndBuiltInDisabled_returnsNoRecorder
                     .setExportBuiltinMetricsToGoogleCloudMonitoring(false)
                     .build())
             .build();
-    OpenTelemetry builtInOtel = org.easymock.EasyMock.createMock(OpenTelemetry.class);
-    org.easymock.EasyMock.replay(builtInOtel);
+    OpenTelemetry builtInOtel = EasyMock.createMock(OpenTelemetry.class);
+    EasyMock.replay(builtInOtel);
     DatastoreMetricsRecorder recorder = DatastoreMetricsRecorder.getInstance(options, builtInOtel);
     assertThat(recorder).isInstanceOf(CompositeDatastoreMetricsRecorder.class);
     CompositeDatastoreMetricsRecorder compositeRecorder =