chore: Add implementation for firestore resource

Author: lqiu96

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

@@ -50,8 +50,7 @@ class OpenTelemetryMetricsRecorder implements MetricsRecorder {
    * Creates a new recorder with a configurable metric prefix.
    *
    * @param openTelemetry the OpenTelemetry instance to record metrics to
-   * @param metricPrefix the prefix for metric names (e.g. "custom.googleapis.com" or
-   *     "datastore.googleapis.com/internal/client")
+   * @param metricPrefix the prefix for metric names (e.g. "custom.googleapis.com")
    */
   OpenTelemetryMetricsRecorder(@Nonnull OpenTelemetry openTelemetry, String metricPrefix) {
     this.openTelemetry = openTelemetry;
@@ -60,41 +59,41 @@ class OpenTelemetryMetricsRecorder implements MetricsRecorder {
 
     this.transactionLatency =
         meter
-            .histogramBuilder(metricPrefix + "/client/transaction_latency")
+            .histogramBuilder(TelemetryConstants.METRIC_NAME_TRANSACTION_LATENCY)
             .setDescription("Total latency of transaction operations")
             .setUnit("ms")
             .build();
 
     this.transactionAttemptCount =
         meter
-            .counterBuilder(metricPrefix + "/client/transaction_attempt_count")
+            .counterBuilder(TelemetryConstants.METRIC_NAME_TRANSACTION_ATTEMPT_COUNT)
             .setDescription("Number of attempts to commit a transaction")
             .build();
 
     this.attemptLatency =
         meter
-            .histogramBuilder(metricPrefix + "/attempt_latency")
+            .histogramBuilder(TelemetryConstants.METRIC_NAME_ATTEMPT_LATENCY)
             .setDescription("Latency of a single RPC attempt")
             .setUnit("ms")
             .build();
 
     this.attemptCount =
         meter
-            .counterBuilder(metricPrefix + "/attempt_count")
+            .counterBuilder(TelemetryConstants.METRIC_NAME_ATTEMPT_COUNT)
             .setDescription("Number of RPC attempts")
             .setUnit("1")
             .build();
 
     this.operationLatency =
         meter
-            .histogramBuilder(metricPrefix + "/operation_latency")
+            .histogramBuilder(TelemetryConstants.METRIC_NAME_OPERATION_LATENCY)
             .setDescription("Total latency of an operation including retries")
             .setUnit("ms")
             .build();
 
     this.operationCount =
         meter
-            .counterBuilder(metricPrefix + "/operation_count")
+            .counterBuilder(TelemetryConstants.METRIC_NAME_OPERATION_COUNT)
             .setDescription("Number of operations")
             .setUnit("1")
             .build();

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

@@ -36,11 +36,11 @@ public class TelemetryConstants {
 
   // TODO(lawrenceqiu): For now, use `custom.googleapis.com` until metrics can be written to
   // datastore domain
-  public static final String SERVICE_NAME = "custom.googleapis.com";
+  public static final String SERVICE_NAME = "firestore.googleapis.com";
   static final String METER_NAME = "com.google.cloud.datastore";
 
   // Built-in metrics constants for Cloud Monitoring export
-  public static final String METRIC_PREFIX = "datastore.googleapis.com/internal/client";
+  public static final String METRIC_PREFIX = "firestore.googleapis.com/internal/client";
   public static final String GAX_METER_NAME = OpenTelemetryMetricsRecorder.GAX_METER_NAME;
   public static final String DATASTORE_METER_NAME = METRIC_PREFIX;
 
@@ -52,8 +52,7 @@ public class TelemetryConstants {
   public static final String RESOURCE_LABEL_DATABASE_ID = "database_id";
   public static final String RESOURCE_LABEL_LOCATION = "location";
   public static final Set<String> DATASTORE_RESOURCE_LABELS =
-      ImmutableSet.of(
-          RESOURCE_LABEL_PROJECT_ID, RESOURCE_LABEL_DATABASE_ID, RESOURCE_LABEL_LOCATION);
+      ImmutableSet.of(RESOURCE_LABEL_PROJECT_ID, RESOURCE_LABEL_DATABASE_ID, RESOURCE_LABEL_LOCATION);
 
   // Resource attribute keys (used on OTel Resource)
   public static final AttributeKey<String> PROJECT_ID_KEY = AttributeKey.stringKey("project_id");
@@ -69,6 +68,9 @@ public class TelemetryConstants {
   public static final AttributeKey<String> LIBRARY_VERSION_KEY =
       AttributeKey.stringKey("library_version");
   public static final AttributeKey<String> TRANSPORT_KEY = AttributeKey.stringKey("transport");
+  public static final AttributeKey<String> SERVICE_KEY = AttributeKey.stringKey("service");
+
+  public static final String SERVICE_VALUE = "datastore.googleapis.com";
 
   // Set of all common metric attributes for view filtering
   public static final Set<AttributeKey> COMMON_ATTRIBUTES =
@@ -79,7 +81,8 @@ public class TelemetryConstants {
           STATUS_KEY,
           DATABASE_KEY,
           LIBRARY_VERSION_KEY,
-          TRANSPORT_KEY);
+          TRANSPORT_KEY,
+          SERVICE_KEY);
 
   // Metric names (short names, without prefix)
   public static final String METRIC_NAME_SHORT_OPERATION_LATENCY = "operation_latency";
@@ -133,35 +136,27 @@ public class TelemetryConstants {
 
   /** Metric name for the total latency of a transaction. */
   public static final String METRIC_NAME_TRANSACTION_LATENCY =
-      SERVICE_NAME + "/client/transaction_latency";
+      SERVICE_NAME + "/internal/client/transaction_latency";
 
   /** Metric name for the number of attempts a transaction took. */
   public static final String METRIC_NAME_TRANSACTION_ATTEMPT_COUNT =
-      SERVICE_NAME + "/client/transaction_attempt_count";
-
-  /**
-   * Metric name for the total latency of an operation (one full RPC call including retries). Note:
-   * This does not have the /client prefix to match Gax's format.
-   */
-  public static final String METRIC_NAME_OPERATION_LATENCY = SERVICE_NAME + "/operation_latency";
-
-  /**
-   * Metric name for the latency of a single RPC attempt. Note: This does not have the /client
-   * prefix to match Gax's format.
-   */
-  public static final String METRIC_NAME_ATTEMPT_LATENCY = SERVICE_NAME + "/attempt_latency";
-
-  /**
-   * Metric name for the count of operations. Note: This does not have the /client prefix to match
-   * Gax's format.
-   */
-  public static final String METRIC_NAME_OPERATION_COUNT = SERVICE_NAME + "/operation_count";
-
-  /**
-   * Metric name for the count of RPC attempts. Note: This does not have the /client prefix to match
-   * Gax's format.
-   */
-  public static final String METRIC_NAME_ATTEMPT_COUNT = SERVICE_NAME + "/attempt_count";
+      SERVICE_NAME + "/internal/client/transaction_attempt_count";
+
+  /** Metric name for the total latency of an operation (one full RPC call including retries). */
+  public static final String METRIC_NAME_OPERATION_LATENCY =
+      SERVICE_NAME + "/internal/client/operation_latency";
+
+  /** Metric name for the latency of a single RPC attempt. */
+  public static final String METRIC_NAME_ATTEMPT_LATENCY =
+      SERVICE_NAME + "/internal/client/attempt_latency";
+
+  /** Metric name for the count of operations. */
+  public static final String METRIC_NAME_OPERATION_COUNT =
+      SERVICE_NAME + "/internal/client/operation_count";
+
+  /** Metric name for the count of RPC attempts. */
+  public static final String METRIC_NAME_ATTEMPT_COUNT =
+      SERVICE_NAME + "/internal/client/attempt_count";
 
   // This is intentionally different from the `SERVICE_NAME` constant as it matches Gax's logic for
   // method name.