googleapis
diff --git a/‎src/client-side-metrics/exporter.ts‎
Lines changed: 2 additions & 1 deletion b/‎src/client-side-metrics/exporter.ts‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎src/client-side-metrics/gcp-metrics-handler.ts‎
Lines changed: 15 additions & 5 deletions b/‎src/client-side-metrics/gcp-metrics-handler.ts‎
Lines changed: 15 additions & 5 deletions
diff --git a/‎src/client-side-metrics/metrics-handler.ts‎
Lines changed: 1 addition & 0 deletions b/‎src/client-side-metrics/metrics-handler.ts‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎src/client-side-metrics/operation-metrics-collector.ts‎
Lines changed: 59 additions & 13 deletions b/‎src/client-side-metrics/operation-metrics-collector.ts‎
Lines changed: 59 additions & 13 deletions
@@ -160,15 +160,16 @@ function getMetric(
 ) {
   const streaming = dataPoint.attributes.streaming;
   const app_profile = dataPoint.attributes.app_profile;
+  const status = dataPoint.attributes.status;
   return {
     type: metricName,
     labels: Object.assign(
       {
         method: dataPoint.attributes.method,
         client_uid: dataPoint.attributes.client_uid,
-        status: dataPoint.attributes.status,
         client_name: dataPoint.attributes.client_name,
       },
+      status ? {status} : null,
       streaming ? {streaming} : null,
       app_profile ? {app_profile} : null,
     ),
 
@@ -236,7 +236,6 @@ export class GCPMetricsHandler implements IMetricsHandler {
       app_profile: data.metricsCollectorData.app_profile,
       method: data.metricsCollectorData.method,
       client_uid: data.metricsCollectorData.client_uid,
-      status: data.status,
       client_name: data.client_name,
       instanceId: data.metricsCollectorData.instanceId,
       table: data.metricsCollectorData.table,
@@ -245,13 +244,24 @@ export class GCPMetricsHandler implements IMetricsHandler {
     };
     otelInstruments.operationLatencies.record(data.operationLatency, {
       streaming: data.streaming,
+      status: data.status,
+      ...commonAttributes,
+    });
+    otelInstruments.retryCount.add(data.retryCount, {
+      status: data.status,
+      ...commonAttributes,
+    });
+    otelInstruments.firstResponseLatencies.record(data.firstResponseLatency, {
+      status: data.status,
       ...commonAttributes,
     });
+    for (const applicationLatency of data.applicationLatencies) {
+      otelInstruments.applicationBlockingLatencies.record(
+        applicationLatency,
+        commonAttributes,
+      );
+    }
     otelInstruments.retryCount.add(data.retryCount, commonAttributes);
-    otelInstruments?.firstResponseLatencies.record(
-      data.firstResponseLatency,
-      commonAttributes,
-    );
   }
 
   /**
 
@@ -42,6 +42,7 @@ interface StandardData {
 export interface OnOperationCompleteData extends StandardData {
   firstResponseLatency?: number;
   operationLatency: number;
+  applicationLatencies: number[];
   retryCount?: number;
 }
 
 
@@ -21,6 +21,7 @@ const root = gax.protobuf.loadSync(
   './protos/google/bigtable/v2/response_params.proto',
 );
 const ResponseParams = root.lookupType('ResponseParams');
+const {hrtime} = require('node:process');
 
 /**
  * An interface representing a tabular API surface, such as a Bigtable table.
@@ -63,8 +64,8 @@ enum MetricsCollectorState {
  */
 export class OperationMetricsCollector {
   private state: MetricsCollectorState;
-  private operationStartTime: Date | null;
-  private attemptStartTime: Date | null;
+  private operationStartTime: bigint | null;
+  private attemptStartTime: bigint | null;
   private zone: string | undefined;
   private cluster: string | undefined;
   private tabularApiSurface: ITabularApiSurface;
@@ -76,6 +77,8 @@ export class OperationMetricsCollector {
   private serverTime: number | null;
   private connectivityErrorCount: number;
   private streamingOperation: StreamingState;
+  private applicationLatencies: number[];
+  private lastRowReceivedTime: bigint | null;
 
   /**
    * @param {ITabularApiSurface} tabularApiSurface Information about the Bigtable table being accessed.
@@ -102,6 +105,8 @@ export class OperationMetricsCollector {
     this.serverTime = null;
     this.connectivityErrorCount = 0;
     this.streamingOperation = streamingOperation;
+    this.lastRowReceivedTime = null;
+    this.applicationLatencies = [];
   }
 
   private getMetricsCollectorData() {
@@ -124,8 +129,9 @@ export class OperationMetricsCollector {
    */
   onOperationStart() {
     if (this.state === MetricsCollectorState.OPERATION_NOT_STARTED) {
-      this.operationStartTime = new Date();
+      this.operationStartTime = hrtime.bigint();
       this.firstResponseLatency = null;
+      this.applicationLatencies = [];
       this.state =
         MetricsCollectorState.OPERATION_STARTED_ATTEMPT_NOT_IN_PROGRESS;
     } else {
@@ -148,13 +154,15 @@ export class OperationMetricsCollector {
       this.state =
         MetricsCollectorState.OPERATION_STARTED_ATTEMPT_NOT_IN_PROGRESS;
       this.attemptCount++;
-      const endTime = new Date();
+      const endTime = hrtime.bigint();
       if (projectId && this.attemptStartTime) {
-        const totalTime = endTime.getTime() - this.attemptStartTime.getTime();
+        const totalMilliseconds = Number(
+          (endTime - this.attemptStartTime) / BigInt(1000000),
+        );
         this.metricsHandlers.forEach(metricsHandler => {
           if (metricsHandler.onAttemptComplete) {
             metricsHandler.onAttemptComplete({
-              attemptLatency: totalTime,
+              attemptLatency: totalMilliseconds,
               serverLatency: this.serverTime ?? undefined,
               connectivityErrorCount: this.connectivityErrorCount,
               streaming: this.streamingOperation,
@@ -181,10 +189,11 @@ export class OperationMetricsCollector {
     ) {
       this.state =
         MetricsCollectorState.OPERATION_STARTED_ATTEMPT_IN_PROGRESS_NO_ROWS_YET;
-      this.attemptStartTime = new Date();
+      this.attemptStartTime = hrtime.bigint();
       this.serverTime = null;
       this.serverTimeRead = false;
       this.connectivityErrorCount = 0;
+      this.lastRowReceivedTime = null;
     } else {
       console.warn('Invalid state transition attempted');
     }
@@ -202,10 +211,12 @@ export class OperationMetricsCollector {
       ) {
         this.state =
           MetricsCollectorState.OPERATION_STARTED_ATTEMPT_IN_PROGRESS_SOME_ROWS_RECEIVED;
-        const endTime = new Date();
+        const endTime = hrtime.bigint();
         if (projectId && this.operationStartTime) {
-          this.firstResponseLatency =
-            endTime.getTime() - this.operationStartTime.getTime();
+          // first response latency is measured in total milliseconds.
+          this.firstResponseLatency = Number(
+            (endTime - this.operationStartTime) / BigInt(1000000),
+          );
         }
       }
     }
@@ -223,9 +234,11 @@ export class OperationMetricsCollector {
       MetricsCollectorState.OPERATION_STARTED_ATTEMPT_NOT_IN_PROGRESS
     ) {
       this.state = MetricsCollectorState.OPERATION_COMPLETE;
-      const endTime = new Date();
+      const endTime = hrtime.bigint();
       if (projectId && this.operationStartTime) {
-        const totalTime = endTime.getTime() - this.operationStartTime.getTime();
+        const totalMilliseconds = Number(
+          (endTime - this.operationStartTime) / BigInt(1000000),
+        );
         {
           this.metricsHandlers.forEach(metricsHandler => {
             if (metricsHandler.onOperationComplete) {
@@ -235,9 +248,10 @@ export class OperationMetricsCollector {
                 metricsCollectorData: this.getMetricsCollectorData(),
                 client_name: `nodejs-bigtable/${version}`,
                 projectId,
-                operationLatency: totalTime,
+                operationLatency: totalMilliseconds,
                 retryCount: this.attemptCount - 1,
                 firstResponseLatency: this.firstResponseLatency ?? undefined,
+                applicationLatencies: this.applicationLatencies,
               });
             }
           });
@@ -281,6 +295,38 @@ export class OperationMetricsCollector {
     }
   }
 
+  /**
+   * Called when a row from the Bigtable stream reaches the application user.
+   *
+   * This method is used to calculate the latency experienced by the application
+   * when reading rows from a Bigtable stream. It records the time between the
+   * previous row being received and the current row reaching the user. These
+   * latencies are then collected and reported as `applicationBlockingLatencies`
+   * when the operation completes.
+   */
+  onRowReachesUser() {
+    if (
+      this.state ===
+        MetricsCollectorState.OPERATION_STARTED_ATTEMPT_IN_PROGRESS_NO_ROWS_YET ||
+      this.state ===
+        MetricsCollectorState.OPERATION_STARTED_ATTEMPT_IN_PROGRESS_SOME_ROWS_RECEIVED ||
+      this.state ===
+        MetricsCollectorState.OPERATION_STARTED_ATTEMPT_NOT_IN_PROGRESS
+    ) {
+      const currentTime = hrtime.bigint();
+      if (this.lastRowReceivedTime) {
+        // application latency is measured in total milliseconds.
+        const applicationLatency = Number(
+          (currentTime - this.lastRowReceivedTime) / BigInt(1000000),
+        );
+        this.applicationLatencies.push(applicationLatency);
+      }
+      this.lastRowReceivedTime = currentTime;
+    } else {
+      console.warn('Invalid state transition attempted');
+    }
+  }
+
   /**
    * Called when status information is received. Extracts zone and cluster information.
    * @param {object} status The received status information.
Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,7 @@ interface StandardData {`
`42`	`42`	`export interface OnOperationCompleteData extends StandardData {`
`43`	`43`	`firstResponseLatency?: number;`
`44`	`44`	`operationLatency: number;`
	`45`	`+ applicationLatencies: number[];`
`45`	`46`	`retryCount?: number;`
`46`	`47`	`}`
`47`	`48`