connection-manager: counters

* Added `terminating` connections;
* Fixed an issue when we trace counters, but they haven't changed.

Author: coot

ouroboros-network-framework/src/Ouroboros/Network/ConnectionManager/Core.hs

@@ -43,12 +43,12 @@ import Data.Typeable (Typeable)
 import GHC.Stack (CallStack, HasCallStack, callStack)
 import System.Random (StdGen, split)
 
+import Data.List qualified as List
 import Data.Map.Strict (Map)
 import Data.Map.Strict qualified as Map
-import Data.Set qualified as Set
-
 import Data.Monoid.Synchronisation
 import Data.Set (Set)
+import Data.Set qualified as Set
 import Data.Tuple (swap)
 import Data.Wedge
 import Data.Word (Word32)
@@ -209,14 +209,15 @@ connectionStateToCounters state =
                                              <> inboundConn
                                             <> outboundConn
 
-      TerminatingState {}                   -> mempty
+      TerminatingState {}                   -> terminatingConn
       TerminatedState {}                    -> mempty
   where
-    fullDuplexConn     = ConnectionManagerCounters 1 0 0 0 0
-    duplexConn         = ConnectionManagerCounters 0 1 0 0 0
-    unidirectionalConn = ConnectionManagerCounters 0 0 1 0 0
-    inboundConn        = ConnectionManagerCounters 0 0 0 1 0
-    outboundConn       = ConnectionManagerCounters 0 0 0 0 1
+    fullDuplexConn     = ConnectionManagerCounters 1 0 0 0 0 0
+    duplexConn         = ConnectionManagerCounters 0 1 0 0 0 0
+    unidirectionalConn = ConnectionManagerCounters 0 0 1 0 0 0
+    inboundConn        = ConnectionManagerCounters 0 0 0 1 0 0
+    outboundConn       = ConnectionManagerCounters 0 0 0 0 1 0
+    terminatingConn    = ConnectionManagerCounters 0 0 0 0 0 1
 
 
 getConnThread :: ConnectionState peerAddr handle handleError version m
@@ -781,7 +782,8 @@ with args@Arguments {
                        else return [ ]
 
                   traverse_ (traceWith trTracer . TransitionTrace connStateId) trs
-                  traceCounters stateVar
+                  when (not $ List.null trs) $
+                    traceCounters stateVar
 
     -- Pruning is done in two stages:
     -- * an STM transaction which selects which connections to prune, and sets

ouroboros-network-framework/src/Ouroboros/Network/ConnectionManager/Types.hs

@@ -695,16 +695,17 @@ data ConnectionManagerCounters = ConnectionManagerCounters {
                                    --   (including DuplexState connections)
       unidirectionalConns :: !Int, -- ^ number of negotiated unidirectional connections
       inboundConns        :: !Int, -- ^ number of inbound connections
-      outboundConns       :: !Int  -- ^ number of outbound connections
+      outboundConns       :: !Int, -- ^ number of outbound connections
+      terminatingConns    :: !Int  -- ^ number of terminating connections
     }
   deriving (Show, Eq, Ord)
 
 instance Semigroup ConnectionManagerCounters where
-    ConnectionManagerCounters fd1 d1 s1 i1 o1 <> ConnectionManagerCounters fd2 d2 s2 i2 o2 =
-      ConnectionManagerCounters (fd1 + fd2) (d1 + d2) (s1 + s2) (i1 + i2) (o1 + o2)
+    ConnectionManagerCounters fd1 d1 s1 i1 o1 t1 <> ConnectionManagerCounters fd2 d2 s2 i2 o2 t2 =
+      ConnectionManagerCounters (fd1 + fd2) (d1 + d2) (s1 + s2) (i1 + i2) (o1 + o2) (t1 + t2)
 
 instance Monoid ConnectionManagerCounters where
-    mempty = ConnectionManagerCounters 0 0 0 0 0
+    mempty = ConnectionManagerCounters 0 0 0 0 0 0
 
 -- | Exceptions used by 'ConnectionManager'.
 --