chore: Fix variable names

Author: lqiu96

java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreImpl.java

@@ -100,8 +100,7 @@ final class DatastoreImpl extends BaseService<DatastoreOptions> implements Datas
 
   private final com.google.cloud.datastore.telemetry.TraceUtil otelTraceUtil =
       getOptions().getTraceUtil();
-  private final DatastoreMetricsRecorder datastoreMetricsRecorder =
-      getOptions().getMetricsRecorder();
+  private final DatastoreMetricsRecorder metricsRecorder = getOptions().getMetricsRecorder();
   private final ReadOptionProtoPreparer readOptionProtoPreparer;
   private final AggregationQueryExecutor aggregationQueryExecutor;
 
@@ -119,7 +118,7 @@ final class DatastoreImpl extends BaseService<DatastoreOptions> implements Datas
                 .setTraceUtil(otelTraceUtil)
                 .setRetrySettings(retrySettings)
                 .setDatastoreOptions(options)
-                .setMetricsRecorder(datastoreMetricsRecorder)
+                .setMetricsRecorder(metricsRecorder)
                 .build(),
             options);
   }
@@ -182,19 +181,19 @@ public boolean isClosed() {
   static class ReadWriteTransactionCallable<T> implements Callable<T> {
     private final Datastore datastore;
     private final TransactionCallable<T> callable;
-    private final DatastoreMetricsRecorder datastoreMetricsRecorder;
+    private final DatastoreMetricsRecorder metricsRecorder;
     private volatile TransactionOptions options;
     private volatile Transaction transaction;
 
     ReadWriteTransactionCallable(
         Datastore datastore,
         TransactionCallable<T> callable,
         TransactionOptions options,
-        DatastoreMetricsRecorder datastoreMetricsRecorder) {
+        DatastoreMetricsRecorder metricsRecorder) {
       this.datastore = datastore;
       this.callable = callable;
       this.options = options;
-      this.datastoreMetricsRecorder = datastoreMetricsRecorder;
+      this.metricsRecorder = metricsRecorder;
       this.transaction = null;
     }
 
@@ -255,7 +254,7 @@ private void recordAttempt(String status, TransportOptions transportOptions) {
       attributes.put(
           TelemetryConstants.ATTRIBUTES_KEY_TRANSPORT,
           TelemetryConstants.getTransportName(transportOptions));
-      datastoreMetricsRecorder.recordTransactionAttemptCount(1, attributes);
+      metricsRecorder.recordTransactionAttemptCount(1, attributes);
     }
   }
 
@@ -270,8 +269,7 @@ public <T> T runInTransaction(
     TraceUtil.Span span = otelTraceUtil.startSpan(SPAN_NAME_TRANSACTION_RUN);
 
     ReadWriteTransactionCallable<T> baseCallable =
-        new ReadWriteTransactionCallable<>(
-            this, callable, transactionOptions, datastoreMetricsRecorder);
+        new ReadWriteTransactionCallable<>(this, callable, transactionOptions, metricsRecorder);
 
     Callable<T> transactionCallable = baseCallable;
     if (getOptions().getOpenTelemetryOptions().isTracingEnabled()) {
@@ -301,7 +299,7 @@ public <T> T runInTransaction(
       attributes.put(
           TelemetryConstants.ATTRIBUTES_KEY_TRANSPORT,
           TelemetryConstants.getTransportName(getOptions().getTransportOptions()));
-      datastoreMetricsRecorder.recordTransactionLatency(latencyMs, attributes);
+      metricsRecorder.recordTransactionLatency(latencyMs, attributes);
       span.end();
     }
   }
@@ -809,8 +807,7 @@ private <T> T runWithObservability(
 
     DatastoreOptions options = getOptions();
     Callable<T> attemptCallable =
-        TelemetryUtils.attemptMetricsCallable(
-            callable, datastoreMetricsRecorder, options, methodName);
+        TelemetryUtils.attemptMetricsCallable(callable, metricsRecorder, options, methodName);
     try (TraceUtil.Scope ignored = span.makeCurrent()) {
       return RetryHelper.runWithRetries(
           attemptCallable, retrySettings, exceptionHandler, options.getClock());
@@ -820,7 +817,7 @@ private <T> T runWithObservability(
       throw DatastoreException.translateAndThrow(e);
     } finally {
       TelemetryUtils.recordOperationMetrics(
-          datastoreMetricsRecorder, options, operationStopwatch, methodName, operationStatus);
+          metricsRecorder, options, operationStopwatch, methodName, operationStatus);
       span.end();
     }
   }

java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/RetryAndTraceDatastoreRpcDecorator.java

@@ -61,7 +61,7 @@ public class RetryAndTraceDatastoreRpcDecorator implements DatastoreRpc {
   private final com.google.cloud.datastore.telemetry.TraceUtil otelTraceUtil;
   private final RetrySettings retrySettings;
   private final DatastoreOptions datastoreOptions;
-  private final DatastoreMetricsRecorder datastoreMetricsRecorder;
+  private final DatastoreMetricsRecorder metricsRecorder;
 
   @ObsoleteApi("Prefer to create RetryAndTraceDatastoreRpcDecorator via the Builder")
   public RetryAndTraceDatastoreRpcDecorator(
@@ -73,15 +73,15 @@ public RetryAndTraceDatastoreRpcDecorator(
     this.retrySettings = retrySettings;
     this.datastoreOptions = datastoreOptions;
     this.otelTraceUtil = otelTraceUtil;
-    this.datastoreMetricsRecorder = new NoOpDatastoreMetricsRecorder();
+    this.metricsRecorder = new NoOpDatastoreMetricsRecorder();
   }
 
   private RetryAndTraceDatastoreRpcDecorator(Builder builder) {
     this.datastoreRpc = builder.datastoreRpc;
     this.otelTraceUtil = builder.otelTraceUtil;
     this.retrySettings = builder.retrySettings;
     this.datastoreOptions = builder.datastoreOptions;
-    this.datastoreMetricsRecorder = builder.datastoreMetricsRecorder;
+    this.metricsRecorder = builder.datastoreMetricsRecorder;
   }
 
   public static Builder newBuilder() {
@@ -207,7 +207,7 @@ <O> O invokeRpc(Callable<O> block, String startSpan, String methodName) {
     try (TraceUtil.Scope ignored = span.makeCurrent()) {
       Callable<O> callable =
           TelemetryUtils.attemptMetricsCallable(
-              block, datastoreMetricsRecorder, datastoreOptions, methodName);
+              block, metricsRecorder, datastoreOptions, methodName);
       O result =
           RetryHelper.runWithRetries(
               callable, this.retrySettings, EXCEPTION_HANDLER, this.datastoreOptions.getClock());
@@ -219,7 +219,7 @@ <O> O invokeRpc(Callable<O> block, String startSpan, String methodName) {
       throw DatastoreException.translateAndThrow(e);
     } finally {
       TelemetryUtils.recordOperationMetrics(
-          datastoreMetricsRecorder, datastoreOptions, stopwatch, methodName, operationStatus);
+          metricsRecorder, datastoreOptions, stopwatch, methodName, operationStatus);
       span.end();
     }
   }

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

@@ -64,7 +64,8 @@ static DatastoreMetricsRecorder getInstance(@Nonnull DatastoreOptions datastoreO
       if (customOtel == null) {
         customOtel = GlobalOpenTelemetry.get();
       }
-      return new OpenTelemetryDatastoreMetricsRecorder(customOtel, TelemetryConstants.METRIC_PREFIX);
+      return new OpenTelemetryDatastoreMetricsRecorder(
+          customOtel, TelemetryConstants.METRIC_PREFIX);
     }
 
     return new NoOpDatastoreMetricsRecorder();

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

@@ -22,8 +22,8 @@
 /**
  * A no-op implementation of {@link DatastoreMetricsRecorder}.
  *
- * <p>Used to stub out metrics instrumentation when metrics are disabled or when no valid
- * recorder could be initialized.
+ * <p>Used to stub out metrics instrumentation when metrics are disabled or when no valid recorder
+ * could be initialized.
  *
  * <p>WARNING: This class is intended for internal use only. It was made public to be used across
  * packages as a default. It should not be used by external customers and its API may change without

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

@@ -71,11 +71,7 @@ public class TelemetryConstants {
    *
    * <p>Cloud Monitoring is strict about label schemas: exporting a label that was not present when
    * the metric descriptor was first created will cause the entire {@code createTimeSeries} call to
-   * fail. Registering OTel Views that filter to this set (see {@link DatastoreBuiltInMetricsView})
-   * prevents unexpected labels from leaking into the export and causing silent data loss.
-   *
-   * <p>Using {@code AttributeKey<?>} (wildcard) rather than the raw {@code AttributeKey} type
-   * preserves generic type safety while still allowing keys of any value type in the set.
+   * fail.
    */
   public static final Set<AttributeKey<?>> COMMON_ATTRIBUTES =
       ImmutableSet.of(

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

@@ -65,52 +65,44 @@ public static Map<String, String> buildMetricAttributes(
    * Records operation-level metrics. This method should be called after the entire operation across
    * all retry attempts has completed.
    *
-   * <p>Metrics are recorded for all transport types (gRPC and HTTP). Previously this method only
-   * recorded metrics for HTTP transport because gRPC metrics were collected separately through
-   * GAX's {@code MetricsTracerFactory}. That mechanism was removed in favour of recording at this
-   * single, transport-agnostic layer so that the built-in Cloud Monitoring exporter captures every
-   * operation regardless of transport.
+   * <p>Metrics are recorded for both transport types (gRPC and HTTP).
    *
-   * @param datastoreMetricsRecorder The metrics recorder.
+   * @param metricsRecorder The metrics recorder.
    * @param datastoreOptions The DatastoreOptions object.
    * @param operationStopwatch The stopwatch tracking the duration of the entire operation.
    * @param methodName The name of the API method.
    * @param status The final status of the operation after all retries.
    */
   public static void recordOperationMetrics(
-      DatastoreMetricsRecorder datastoreMetricsRecorder,
+      DatastoreMetricsRecorder metricsRecorder,
       DatastoreOptions datastoreOptions,
       Stopwatch operationStopwatch,
       String methodName,
       String status) {
     if (methodName != null) {
       Map<String, String> attributes = buildMetricAttributes(datastoreOptions, methodName, status);
-      datastoreMetricsRecorder.recordOperationLatency(
+      metricsRecorder.recordOperationLatency(
           operationStopwatch.elapsed(TimeUnit.MILLISECONDS), attributes);
-      datastoreMetricsRecorder.recordOperationCount(1, attributes);
+      metricsRecorder.recordOperationCount(1, attributes);
     }
   }
 
   /**
    * Wraps a callable with logic to record attempt-level metrics. Attempt metrics are recorded for
    * each individual execution of the callable, regardless of whether it succeeds or fails.
    *
-   * <p>Metrics are recorded for all transport types (gRPC and HTTP). Previously this wrapper only
-   * recorded metrics for HTTP transport because gRPC metrics were collected separately through
-   * GAX's {@code MetricsTracerFactory}. That mechanism was removed in favour of recording at this
-   * single, transport-agnostic layer so that the built-in Cloud Monitoring exporter captures every
-   * attempt regardless of transport.
+   * <p>Metrics are recorded for both transport types (gRPC and HTTP).
    *
    * @param callable The original callable to execute.
-   * @param datastoreMetricsRecorder The metrics recorder.
+   * @param metricsRecorder The metrics recorder.
    * @param datastoreOptions The DatastoreOptions object.
    * @param methodName The name of the API method.
    * @param <T> The return type of the callable.
    * @return A wrapped callable that includes attempt-level metrics recording.
    */
   public static <T> Callable<T> attemptMetricsCallable(
       Callable<T> callable,
-      DatastoreMetricsRecorder datastoreMetricsRecorder,
+      DatastoreMetricsRecorder metricsRecorder,
       DatastoreOptions datastoreOptions,
       String methodName) {
     return () -> {
@@ -126,9 +118,8 @@ public static <T> Callable<T> attemptMetricsCallable(
       } finally {
         Map<String, String> attributes =
             buildMetricAttributes(datastoreOptions, methodName, status);
-        datastoreMetricsRecorder.recordAttemptLatency(
-            stopwatch.elapsed(TimeUnit.MILLISECONDS), attributes);
-        datastoreMetricsRecorder.recordAttemptCount(1, attributes);
+        metricsRecorder.recordAttemptLatency(stopwatch.elapsed(TimeUnit.MILLISECONDS), attributes);
+        metricsRecorder.recordAttemptCount(1, attributes);
       }
     };
   }