chore: Refactor tests to create Otel objects

Author: lqiu96

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

@@ -18,7 +18,13 @@
 
 import com.google.api.core.InternalApi;
 
-/** Internal telemetry constants shared between OpenTelemetry tracing and metrics. */
+/**
+ * Internal telemetry constants shared between OpenTelemetry tracing and metrics.
+ *
+ * <p><b>Warning:</b> This is intended to be an internal API and is not intended for external use.
+ * This is public solely for implementation purposes and does not promise any backwards
+ * compatibility.
+ */
 @InternalApi
 public class TelemetryConstants {
   static final String SERVICE_NAME = "datastore.googleapis.com";

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

@@ -26,24 +26,16 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
-/**
- * Tests for {@link MetricsRecorder#getInstance(DatastoreOpenTelemetryOptions)}.
- *
- * <p>Note: Since {@code setMetricsEnabled()} is package-private on {@link
- * DatastoreOpenTelemetryOptions.Builder}, these tests can only verify the default (metrics
- * disabled) behavior and the behavior when an explicit OpenTelemetry instance is provided. The
- * metrics-enabled paths are exercised through the {@link DatastoreImplMetricsTest} which operates
- * in the {@code com.google.cloud.datastore} package.
- */
+/** Tests for {@link MetricsRecorder#getInstance(DatastoreOpenTelemetryOptions)}. */
 @RunWith(JUnit4.class)
 public class MetricsRecorderTest {
 
+  // TODO(lawrenceqiu): For now, the default behavior is no-op. Add a test for
+  // instance being OpenTelemetryMetricsRecorder later (visibility changes)
   @Test
   public void defaultOptionsReturnNoOp() {
     DatastoreOpenTelemetryOptions options = DatastoreOpenTelemetryOptions.newBuilder().build();
-
     MetricsRecorder recorder = MetricsRecorder.getInstance(options);
-
     assertThat(recorder).isInstanceOf(NoOpMetricsRecorder.class);
   }
 
@@ -52,20 +44,12 @@ public void tracingEnabledButMetricsDisabledReturnsNoOp() {
     // Enabling tracing alone should not enable metrics
     DatastoreOpenTelemetryOptions options =
         DatastoreOpenTelemetryOptions.newBuilder().setTracingEnabled(true).build();
-
     MetricsRecorder recorder = MetricsRecorder.getInstance(options);
-
     assertThat(recorder).isInstanceOf(NoOpMetricsRecorder.class);
   }
 
-  @Test
-  public void noOpRecorderDoesNotThrow() {
-    // Verify NoOpMetricsRecorder methods do not throw
-    NoOpMetricsRecorder recorder = new NoOpMetricsRecorder();
-    recorder.recordTransactionLatency(100.0, null);
-    recorder.recordTransactionAttemptCount(1, null);
-  }
-
+  // TODO(lawrenceqiu): Temporary test to ensure that OpenTelemetryMetricsRecorder can
+  // be created by the DatastoreOpenTelemetryOptions and creates with Otel object
   @Test
   public void openTelemetryRecorderCreatedWithExplicitOpenTelemetry() {
     InMemoryMetricReader metricReader = InMemoryMetricReader.create();

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

@@ -62,8 +62,7 @@ public void recordTransactionLatency_recordsHistogramWithAttributes() {
     Collection<MetricData> metrics = metricReader.collectAllMetrics();
     MetricData latencyMetric =
         metrics.stream()
-            .filter(
-                m -> m.getName().equals(TelemetryConstants.SERVICE_NAME + "/transaction_latency"))
+            .filter(m -> m.getName().equals(TelemetryConstants.METRIC_NAME_TRANSACTION_LATENCY))
             .findFirst()
             .orElse(null);
 
@@ -101,9 +100,7 @@ public void recordTransactionAttemptCount_recordsCounterWithAttributes() {
     MetricData attemptMetric =
         metrics.stream()
             .filter(
-                m ->
-                    m.getName()
-                        .equals(TelemetryConstants.SERVICE_NAME + "/transaction_attempt_count"))
+                m -> m.getName().equals(TelemetryConstants.METRIC_NAME_TRANSACTION_ATTEMPT_COUNT))
             .findFirst()
             .orElse(null);
 
@@ -148,9 +145,7 @@ public void recordTransactionAttemptCount_multipleAttempts_accumulates() {
     MetricData attemptMetric =
         metrics.stream()
             .filter(
-                m ->
-                    m.getName()
-                        .equals(TelemetryConstants.SERVICE_NAME + "/transaction_attempt_count"))
+                m -> m.getName().equals(TelemetryConstants.METRIC_NAME_TRANSACTION_ATTEMPT_COUNT))
             .findFirst()
             .orElse(null);
 
@@ -161,16 +156,10 @@ public void recordTransactionAttemptCount_multipleAttempts_accumulates() {
   }
 
   @Test
-  public void recordTransactionLatency_nullAttributes_doesNotThrow() {
-    // Should not throw even when attributes are null
+  public void recordTransactionLatency_nullAttributes() {
     recorder.recordTransactionLatency(100.0, null);
 
     Collection<MetricData> metrics = metricReader.collectAllMetrics();
     assertThat(metrics).isNotEmpty();
   }
-
-  @Test
-  public void getOpenTelemetry_returnsConfiguredInstance() {
-    assertThat(recorder.getOpenTelemetry()).isNotNull();
-  }
 }