chore: Remove duplicate declaration of attempt and operation metrics

Author: lqiu96

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

@@ -49,12 +49,11 @@ class OpenTelemetryDatastoreMetricsRecorder extends OpenTelemetryMetricsRecorder
   private final DoubleHistogram transactionLatency;
   private final LongCounter transactionAttemptCount;
 
-  // GAX operation/attempt latency metrics re-registered under the Datastore meter with the
-  // plural names required by the internal Cloud Monitoring descriptor. These override the
-  // singular-named histograms registered by the parent GAX class.
-  private final DoubleHistogram operationLatency;
-  private final DoubleHistogram attemptLatency;
-
+  // 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.
   OpenTelemetryDatastoreMetricsRecorder(@Nonnull OpenTelemetry openTelemetry, String metricPrefix) {
     super(openTelemetry, metricPrefix);
     this.openTelemetry = openTelemetry;
@@ -73,37 +72,12 @@ class OpenTelemetryDatastoreMetricsRecorder extends OpenTelemetryMetricsRecorder
             .counterBuilder(TelemetryConstants.METRIC_NAME_TRANSACTION_ATTEMPT_COUNT)
             .setDescription("Number of attempts to commit a transaction")
             .build();
-
-    this.operationLatency =
-        meter
-            .histogramBuilder(TelemetryConstants.METRIC_NAME_OPERATION_LATENCY)
-            .setDescription(
-                "Total time until final operation success or failure, including retries and backoff.")
-            .setUnit("ms")
-            .build();
-
-    this.attemptLatency =
-        meter
-            .histogramBuilder(TelemetryConstants.METRIC_NAME_ATTEMPT_LATENCY)
-            .setDescription("Time an individual attempt took")
-            .setUnit("ms")
-            .build();
   }
 
   OpenTelemetry getOpenTelemetry() {
     return openTelemetry;
   }
 
-  @Override
-  public void recordOperationLatency(double latencyMs, Map<String, String> attributes) {
-    operationLatency.record(latencyMs, toOtelAttributes(attributes));
-  }
-
-  @Override
-  public void recordAttemptLatency(double latencyMs, Map<String, String> attributes) {
-    attemptLatency.record(latencyMs, toOtelAttributes(attributes));
-  }
-
   @Override
   public void recordTransactionLatency(double latencyMs, Map<String, String> attributes) {
     transactionLatency.record(latencyMs, toOtelAttributes(attributes));

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

@@ -175,12 +175,11 @@ public void recordAttemptLatency_recordsHistogramWithAttributes() {
     Collection<MetricData> metrics = metricReader.collectAllMetrics();
     MetricData metric =
         metrics.stream()
-            .filter(m -> m.getName().equals(TelemetryConstants.METRIC_NAME_ATTEMPT_LATENCY))
+            .filter(m -> m.getName().equals(TelemetryConstants.METRIC_PREFIX + "/attempt_latency"))
             .findFirst()
             .orElse(null);
 
     assertThat(metric).isNotNull();
-    assertThat(metric.getDescription()).isEqualTo("Time an individual attempt took");
     assertThat(metric.getUnit()).isEqualTo("ms");
 
     HistogramPointData point =
@@ -206,12 +205,11 @@ public void recordAttemptCount_recordsCounterWithAttributes() {
     Collection<MetricData> metrics = metricReader.collectAllMetrics();
     MetricData metric =
         metrics.stream()
-            .filter(m -> m.getName().equals(TelemetryConstants.METRIC_NAME_ATTEMPT_COUNT))
+            .filter(m -> m.getName().equals(TelemetryConstants.METRIC_PREFIX + "/attempt_count"))
             .findFirst()
             .orElse(null);
 
     assertThat(metric).isNotNull();
-    assertThat(metric.getDescription()).isEqualTo("Number of Attempts");
 
     LongPointData point = metric.getLongSumData().getPoints().stream().findFirst().orElse(null);
     assertThat(point).isNotNull();
@@ -229,14 +227,12 @@ public void recordOperationLatency_recordsHistogramWithAttributes() {
     Collection<MetricData> metrics = metricReader.collectAllMetrics();
     MetricData metric =
         metrics.stream()
-            .filter(m -> m.getName().equals(TelemetryConstants.METRIC_NAME_OPERATION_LATENCY))
+            .filter(
+                m -> m.getName().equals(TelemetryConstants.METRIC_PREFIX + "/operation_latency"))
             .findFirst()
             .orElse(null);
 
     assertThat(metric).isNotNull();
-    assertThat(metric.getDescription())
-        .isEqualTo(
-            "Total time until final operation success or failure, including retries and backoff.");
     assertThat(metric.getUnit()).isEqualTo("ms");
 
     HistogramPointData point =
@@ -258,12 +254,11 @@ public void recordOperationCount_recordsCounterWithAttributes() {
     Collection<MetricData> metrics = metricReader.collectAllMetrics();
     MetricData metric =
         metrics.stream()
-            .filter(m -> m.getName().equals(TelemetryConstants.METRIC_NAME_OPERATION_COUNT))
+            .filter(m -> m.getName().equals(TelemetryConstants.METRIC_PREFIX + "/operation_count"))
             .findFirst()
             .orElse(null);
 
     assertThat(metric).isNotNull();
-    assertThat(metric.getDescription()).isEqualTo("Number of Operations");
 
     LongPointData point = metric.getLongSumData().getPoints().stream().findFirst().orElse(null);
     assertThat(point).isNotNull();