Track disconnects initiated by the client

Author: joshua-spacetime

crates/client-api/src/routes/subscribe.rs

@@ -431,8 +431,15 @@ async fn ws_client_actor_inner(
 
                 // if this is the closed-by-them case, let the ClientConnectionSenders know now.
                 sendrx.close();
-                closed = true;
                 log::trace!("Close frame {:?}", close_frame);
+                if !closed {
+                    // This is the client telling us they want to close.
+                    WORKER_METRICS
+                        .ws_clients_closed_connection
+                        .with_label_values(&addr)
+                        .inc();
+                }
+                closed = true;
             }
         }
     }

crates/core/src/worker_metrics/mod.rs

@@ -21,10 +21,15 @@ metrics_group!(
         pub ws_clients_spawned: IntGaugeVec,
 
         #[name = spacetime_worker_ws_clients_aborted]
-        #[help = "Number of ws client connections aborted"]
+        #[help = "Number of ws client connections aborted by either the server or the client"]
         #[labels(database_identity: Identity)]
         pub ws_clients_aborted: IntGaugeVec,
 
+        #[name = spacetime_worker_ws_clients_closed_connection]
+        #[help = "Number of ws connections closed by the client"]
+        #[labels(database_identity: Identity)]
+        pub ws_clients_closed_connection: IntGaugeVec,
+
         #[name = spacetime_websocket_requests_total]
         #[help = "The cumulative number of websocket request messages"]
         #[labels(database_identity: Identity, protocol: str)]