feat: add duration to health metrics

agrawal-siddharth · agrawal-siddharth · commit 9333aaed77e3 · 2026-05-13T19:36:24.000Z
diff --git a/java-bigquerystorage/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/ConnectionWorker.java b/java-bigquerystorage/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/ConnectionWorker.java
@@ -383,13 +383,14 @@ class HealthCheckFields {
       String streamName;
       String writerId;
       String windowStartTime;
+      String windowDuration;
     }
 
     /*
      * Compute current values of all health check metrics.
      */
     private void gatherHealthCheckMetrics(HealthCheckFields healthCheckFields) {
-      healthCheckFields.streamName = streamName;
+      healthCheckFields.streamName = isMultiplexing ? "MULTIPLEXING" : streamName;
       healthCheckFields.writerId = writerId;
       healthCheckFields.queuedRequestCountMax = windowedQueuedRequestsMax;
       healthCheckFields.queuedRetryCountMax = windowedQueuedRetriesMax;
@@ -412,6 +413,7 @@ private void gatherHealthCheckMetrics(HealthCheckFields healthCheckFields) {
       healthCheckFields.connectionClosedCount = windowedConnectionClosedCount;
       healthCheckFields.isConnected = streamConnectionIsConnected;
       healthCheckFields.windowStartTime = healthCheckTimeStamp.toString();
+      healthCheckFields.windowDuration = HEALTH_CHECK_INTERVAL.toString();
     }
 
     /*
diff --git a/java-bigquerystorage/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1/ConnectionWorkerTest.java b/java-bigquerystorage/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1/ConnectionWorkerTest.java
@@ -1206,7 +1206,7 @@ void testHealthCheck() throws Exception {
             && healthCheckFields.msecLongestResponseWaitTime < msecResponseDelay);
     assertEquals(appendCount, healthCheckFields.queuedRequestCountMax);
     assertEquals(appendCount * sizePerRequest, healthCheckFields.inflightBytes);
-    assertEquals("projects/p1/datasets/d1/tables/t1/streams/s1", healthCheckFields.streamName);
+    assertEquals("MULTIPLEXING", healthCheckFields.streamName);
     assertEquals(connectionWorker.getWriterId(), healthCheckFields.writerId);
 
     // Wait for responses to arrive
@@ -1362,6 +1362,7 @@ void testInflightRetryCountHealthMetric() throws Exception {
             /* enableRequestProfiler= */ false,
             /* enableOpenTelemetry= */ false,
             /* isMultiplexing= */ true);
+    connectionWorker.setTestOnlyHealthCheckInterval(Duration.ofSeconds(10));
 
     // Simulate a retriable error
     int msecResponseDelay = 1000;
@@ -1388,6 +1389,8 @@ void testInflightRetryCountHealthMetric() throws Exception {
     assertTrue(healthCheckFields.responseCodes.containsKey(Code.INTERNAL.value()));
     assertEquals(1, healthCheckFields.responseCodes.get(Code.INTERNAL.value()));
     assertFalse(healthCheckFields.responseCodes.containsKey(Status.Code.OK.value()));
+    assertEquals("MULTIPLEXING", healthCheckFields.streamName);
+    assertEquals(Duration.ofSeconds(10).toString(), healthCheckFields.windowDuration);
 
     // Allow the retries to complete successfully
     future.get();
@@ -1499,5 +1502,6 @@ void testInflightRetryCountHealthMetricExactlyOnce() throws Exception {
     assertEquals(1, healthCheckFields.responseCodes.get(Code.INTERNAL.value()));
     assertTrue(healthCheckFields.responseCodes.containsKey(Status.Code.OK.value()));
     assertEquals(3, healthCheckFields.responseCodes.get(Status.Code.OK.value()));
+    assertEquals("projects/p1/datasets/d1/tables/t1/streams/s1", healthCheckFields.streamName);
   }
 }
