state-peer-actions: log handshake error

IntersectMBO · Nov 7, 2022 · 33cddec · 33cddec
1 parent 968183b
commit 33cddec
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/ouroboros-network/src/Ouroboros/Network/Diffusion/P2P.hs b/ouroboros-network/src/Ouroboros/Network/Diffusion/P2P.hs
@@ -137,7 +137,7 @@ data TracersExtra ntnAddr ntnVersion ntnVersionData
         :: Tracer m PeerSelectionCounters
 
     , dtPeerSelectionActionsTracer
-        :: Tracer m (PeerSelectionActionsTrace ntnAddr)
+        :: Tracer m (PeerSelectionActionsTrace ntnAddr ntnVersion)
 
     , dtConnectionManagerTracer
         :: Tracer m (ConnectionManagerTrace

diff --git a/ouroboros-network/src/Ouroboros/Network/PeerSelection/PeerStateActions.hs b/ouroboros-network/src/Ouroboros/Network/PeerSelection/PeerStateActions.hs
@@ -491,7 +491,7 @@ instance ( Show peerAddr
 data PeerStateActionsArguments muxMode socket peerAddr versionNumber m a b =
     PeerStateActionsArguments {
 
-      spsTracer                 :: Tracer m (PeerSelectionActionsTrace peerAddr),
+      spsTracer                 :: Tracer m (PeerSelectionActionsTrace peerAddr versionNumber),
 
       -- | Peer deactivation timeout: timeouts stopping hot protocols.
       --
@@ -714,13 +714,13 @@ withPeerStateActions PeerStateActionsArguments {
                 HandleHandshakeClientError err -> do
                   traceWith spsTracer (PeerStatusChangeFailure
                                         (ColdToWarm Nothing remotePeerAddr)
-                                        HandshakeClientFailure)
+                                        (HandshakeClientFailure err))
                   throwIO (ClientException err)
 
                 HandleHandshakeServerError err -> do
                   traceWith spsTracer (PeerStatusChangeFailure
                                         (ColdToWarm Nothing remotePeerAddr)
-                                        HandshakeServerFailure)
+                                        (HandshakeServerFailure err))
                   throwIO (ServerException err)
 
                 HandleError err -> do
@@ -1041,9 +1041,9 @@ startProtocols tok PeerConnectionHandle { pchMux, pchAppHandles } = do
 -- | Type of failure with additional exception context; We don't log handshake
 -- errors as this will be done by the handshake tracer.
 --
-data FailureType =
-      HandshakeClientFailure
-    | HandshakeServerFailure
+data FailureType versionNumber =
+      HandshakeClientFailure !(HandshakeException versionNumber)
+    | HandshakeServerFailure !(HandshakeException versionNumber)
     | HandleFailure !SomeException
     | MuxStoppedFailure
     | TimeoutError
@@ -1068,9 +1068,9 @@ data PeerStatusChangeType peerAddr =
 
 -- | Traces produced by 'peerSelectionActions'.
 --
-data PeerSelectionActionsTrace peerAddr =
+data PeerSelectionActionsTrace peerAddr vNumber =
       PeerStatusChanged       (PeerStatusChangeType peerAddr)
-    | PeerStatusChangeFailure (PeerStatusChangeType peerAddr) FailureType
+    | PeerStatusChangeFailure (PeerStatusChangeType peerAddr) (FailureType vNumber)
     | PeerMonitoringError     (ConnectionId peerAddr) SomeException
     | PeerMonitoringResult    (ConnectionId peerAddr) (WithSomeProtocolTemperature FirstToFinishResult)
   deriving Show
diff --git a/ouroboros-network/test/Test/Ouroboros/Network/Testnet.hs b/ouroboros-network/test/Test/Ouroboros/Network/Testnet.hs
@@ -165,7 +165,7 @@ data DiffusionTestTrace =
       DiffusionLocalRootPeerTrace (TraceLocalRootPeers NtNAddr SomeException)
     | DiffusionPublicRootPeerTrace TracePublicRootPeers
     | DiffusionPeerSelectionTrace (TracePeerSelection NtNAddr)
-    | DiffusionPeerSelectionActionsTrace (PeerSelectionActionsTrace NtNAddr)
+    | DiffusionPeerSelectionActionsTrace (PeerSelectionActionsTrace NtNAddr NtNVersion)
     | DiffusionDebugPeerSelectionTrace (DebugPeerSelection NtNAddr)
     | DiffusionConnectionManagerTrace
         (ConnectionManagerTrace NtNAddr
@@ -468,7 +468,7 @@ prop_peer_selection_action_trace_coverage defaultBearerInfo diffScript =
                                 tracerDiffusionSimWithTimeName
                                 nullTracer
 
-      events :: [PeerSelectionActionsTrace NtNAddr]
+      events :: [PeerSelectionActionsTrace NtNAddr NtNVersion]
       events = mapMaybe (\case DiffusionPeerSelectionActionsTrace st -> Just st
                                _                                     -> Nothing
                         )
@@ -483,7 +483,8 @@ prop_peer_selection_action_trace_coverage defaultBearerInfo diffScript =
              . traceEvents
              $ runSimTrace sim
 
-      peerSelectionActionsTraceMap :: PeerSelectionActionsTrace NtNAddr -> String
+      peerSelectionActionsTraceMap :: PeerSelectionActionsTrace NtNAddr NtNVersion
+                                   -> String
       peerSelectionActionsTraceMap (PeerStatusChanged _)             =
         "PeerStatusChanged"
       peerSelectionActionsTraceMap (PeerStatusChangeFailure _ ft) =