cardano-node: Fixes for #6388

Author: jutaro

cardano-node/src/Cardano/Node/Tracing/Tracers/Consensus.hs

@@ -736,24 +736,14 @@ instance LogFormatting (FetchDecision [Point header]) where
              ]
 
 instance MetaTrace (FetchDecision [Point header]) where
-    namespaceFor (Left FetchDeclineChainIntersectionTooDeep)
-                          = Namespace [] ["Decline", "ChainIntersectionTooDeep"]
-    namespaceFor (Left FetchDeclineChainNotPlausible)
-                          = Namespace [] ["Decline", "FetchDeclineChainNotPlausible"]
-    namespaceFor (Left FetchDeclineAlreadyFetched)
-                          = Namespace [] ["Decline", "FetchDeclineAlreadyFetched"]
-    namespaceFor (Left FetchDeclineInFlightThisPeer)
-                          = Namespace [] ["Decline", "FetchDeclineInFlightThisPeer"]
-    namespaceFor (Left FetchDeclineInFlightOtherPeer)
-                          = Namespace [] ["Decline", "FetchDeclineInFlightOtherPeer"]
     namespaceFor (Left _) = Namespace [] ["Decline"]
     namespaceFor (Right _) = Namespace [] ["Accept"]
 
-    severityFor (Namespace _ ["Decline", "FetchDeclineChainNotPlausible"]) _ = Just Debug
-    severityFor (Namespace _ ["Decline", "ChainIntersectionTooDeep"]) _ = Just Notice
-    severityFor (Namespace _ ["Decline", "FetchDeclineAlreadyFetched"]) _ = Just Debug
-    severityFor (Namespace _ ["Decline", "FetchDeclineInFlightThisPeer"]) _ = Just Debug
-    severityFor (Namespace _ ["Decline", "FetchDeclineInFlightOtherPeer"]) _ = Just Debug
+    severityFor (Namespace _ ["Decline"]) (Just (Left FetchDeclineChainIntersectionTooDeep)) = Just Debug
+    severityFor (Namespace _ ["Decline"]) (Just (Left FetchDeclineChainNotPlausible)) = Just Notice
+    severityFor (Namespace _ ["Decline"]) (Just (Left FetchDeclineAlreadyFetched)) = Just Debug
+    severityFor (Namespace _ ["Decline"]) (Just (Left FetchDeclineInFlightThisPeer)) = Just Debug
+    severityFor (Namespace _ ["Decline"]) (Just (Left (FetchDeclineInFlightOtherPeer))) = Just Debug
     severityFor (Namespace _ ["Decline"]) _ = Just Info
     severityFor (Namespace _ ["Accept"])  _ = Just Info
     severityFor _ _ = Nothing

cardano-node/src/Cardano/Node/Tracing/Tracers/P2P.hs

@@ -1481,6 +1481,7 @@ instance MetaTrace (ConnectionManager.Trace addr
           TrHandshakeServerError {} -> Info
           TrConnectionHandlerError _ _ ShutdownNode  -> Critical
           TrConnectionHandlerError _ _ ShutdownPeer  -> Info
+    severityFor (Namespace _  ["ConnectionHandler"]) _ = Just Info
     severityFor (Namespace _  ["ConnectionHandler"]) Nothing = Just Info
     severityFor (Namespace _  ["Shutdown"]) _ = Just Info
     severityFor (Namespace _  ["ConnectionExists"]) _ = Just Info