Merge 2d28389 into 3e3798f

Author: flub

iroh-relay/src/server/client.rs

@@ -210,6 +210,10 @@ struct Actor {
 
 impl Actor {
     async fn run(mut self, done: CancellationToken) {
+        // Note the accept and disconnects metrics must be in a pair.  Technically the
+        // connection is accepted long before this in the HTTP server, but it is clearer to
+        // handle the metric here.
+        inc!(Metrics, accepts);
         match self.run_inner(done).await {
             Err(e) => {
                 warn!("actor errored {e:#?}, exiting");
@@ -220,6 +224,7 @@ impl Actor {
         }
 
         self.clients.unregister(self.connection_id, self.node_id);
+        inc!(Metrics, disconnects);
     }
 
     async fn run_inner(&mut self, done: CancellationToken) -> Result<()> {

iroh-relay/src/server/http_server.rs

@@ -551,7 +551,6 @@ impl Inner {
             rate_limit: self.rate_limit,
         };
         trace!("accept: create client");
-        inc!(Metrics, accepts);
         let node_id = client_conn_builder.node_id;
         trace!(node_id = node_id.fmt_short(), "create client");