From dbf343f5b055faeffe8082adc1b6fba2185bd7c1 Mon Sep 17 00:00:00 2001 From: Marcin Szamotulski Date: Thu, 4 Dec 2025 12:22:23 +0100 Subject: [PATCH 1/7] tracing: block-fetch Use the same severities in the new tracing system as in the old one. --- .../src/Cardano/Node/Tracing/Tracers/Consensus.hs | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/cardano-node/src/Cardano/Node/Tracing/Tracers/Consensus.hs b/cardano-node/src/Cardano/Node/Tracing/Tracers/Consensus.hs index c204e8d418a..b32c7d4669e 100644 --- a/cardano-node/src/Cardano/Node/Tracing/Tracers/Consensus.hs +++ b/cardano-node/src/Cardano/Node/Tracing/Tracers/Consensus.hs @@ -736,9 +736,24 @@ 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 Info severityFor (Namespace _ ["Accept"]) _ = Just Info severityFor _ _ = Nothing From 24753b1298ff6dcf883bd8e971f36b706680badc Mon Sep 17 00:00:00 2001 From: Marcin Szamotulski Date: Thu, 4 Dec 2025 12:44:48 +0100 Subject: [PATCH 2/7] tracing: connection manager * removed unused namespace "ImpossibleConnection" * set severity of `ConnectionManagerCounters` to `Info` (as in the legacy tracing system) --- cardano-node/src/Cardano/Node/Tracing/Tracers/P2P.hs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/cardano-node/src/Cardano/Node/Tracing/Tracers/P2P.hs b/cardano-node/src/Cardano/Node/Tracing/Tracers/P2P.hs index 96539155e56..9c3783b6744 100644 --- a/cardano-node/src/Cardano/Node/Tracing/Tracers/P2P.hs +++ b/cardano-node/src/Cardano/Node/Tracing/Tracers/P2P.hs @@ -1489,11 +1489,10 @@ 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 severityFor (Namespace _ ["ForbiddenConnection"]) _ = Just Info - severityFor (Namespace _ ["ImpossibleConnection"]) _ = Just Info severityFor (Namespace _ ["ConnectionFailure"]) _ = Just Info severityFor (Namespace _ ["ConnectionNotFound"]) _ = Just Debug severityFor (Namespace _ ["ForbiddenOperation"]) _ = Just Info @@ -1501,7 +1500,7 @@ instance MetaTrace (ConnectionManager.Trace addr severityFor (Namespace _ ["ConnectionCleanup"]) _ = Just Debug severityFor (Namespace _ ["ConnectionTimeWait"]) _ = Just Debug severityFor (Namespace _ ["ConnectionTimeWaitDone"]) _ = Just Info - severityFor (Namespace _ ["ConnectionManagerCounters"]) _ = Just Debug + severityFor (Namespace _ ["ConnectionManagerCounters"]) _ = Just Info severityFor (Namespace _ ["State"]) _ = Just Info severityFor (Namespace _ ["UnexpectedlyFalseAssertion"]) _ = Just Error severityFor _ _ = Nothing @@ -1516,7 +1515,6 @@ instance MetaTrace (ConnectionManager.Trace addr documentFor (Namespace _ ["Shutdown"]) = Just "" documentFor (Namespace _ ["ConnectionExists"]) = Just "" documentFor (Namespace _ ["ForbiddenConnection"]) = Just "" - documentFor (Namespace _ ["ImpossibleConnection"]) = Just "" documentFor (Namespace _ ["ConnectionFailure"]) = Just "" documentFor (Namespace _ ["ConnectionNotFound"]) = Just "" documentFor (Namespace _ ["ForbiddenOperation"]) = Just "" @@ -1550,7 +1548,6 @@ instance MetaTrace (ConnectionManager.Trace addr , Namespace [] ["Shutdown"] , Namespace [] ["ConnectionExists"] , Namespace [] ["ForbiddenConnection"] - , Namespace [] ["ImpossibleConnection"] , Namespace [] ["ConnectionFailure"] , Namespace [] ["ConnectionNotFound"] , Namespace [] ["ForbiddenOperation"] From f550a6eb503cc81807419795ab2360e6042ce9d5 Mon Sep 17 00:00:00 2001 From: Marcin Szamotulski Date: Thu, 4 Dec 2025 12:46:47 +0100 Subject: [PATCH 3/7] tracing: refactored P2P module Using type aliases exposed by `cardano-diffusion` package. --- .../src/Cardano/Node/Tracing/Tracers/P2P.hs | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/cardano-node/src/Cardano/Node/Tracing/Tracers/P2P.hs b/cardano-node/src/Cardano/Node/Tracing/Tracers/P2P.hs index 9c3783b6744..d9a320898a6 100644 --- a/cardano-node/src/Cardano/Node/Tracing/Tracers/P2P.hs +++ b/cardano-node/src/Cardano/Node/Tracing/Tracers/P2P.hs @@ -13,11 +13,9 @@ module Cardano.Node.Tracing.Tracers.P2P () where import Cardano.Logging -import Cardano.Network.Diffusion (TraceChurnMode (..)) +import Cardano.Network.Diffusion.Types import qualified Cardano.Network.PeerSelection.ExtraRootPeers as Cardano.PublicRootPeers -import qualified Cardano.Network.PeerSelection.Governor.PeerSelectionState as Cardano import qualified Cardano.Network.PeerSelection.Governor.Types as Cardano -import Cardano.Network.PeerSelection.PeerTrustable (PeerTrustable) import Cardano.Node.Configuration.TopologyP2P () import Cardano.Node.Tracing.Tracers.NodeToNode () import Cardano.Tracing.OrphanInstances.Network () @@ -39,7 +37,6 @@ import Ouroboros.Network.PeerSelection.Governor (DebugPeerSelection (. peerSelectionStateToCounters) import Ouroboros.Network.PeerSelection.Governor.Types (DemotionTimeoutException) import Ouroboros.Network.PeerSelection.PeerStateActions (PeerSelectionActionsTrace (..)) -import Ouroboros.Network.PeerSelection.RelayAccessPoint (RelayAccessPoint) import Ouroboros.Network.PeerSelection.RootPeersDNS.DNSActions (DNSTrace (..)) import Ouroboros.Network.PeerSelection.RootPeersDNS.LocalRootPeers (TraceLocalRootPeers (..)) @@ -91,12 +88,7 @@ instance LogFormatting NtN.RemoteAddress where -- LocalRootPeers Tracer -------------------------------------------------------------------------------- -instance - ( ToJSONKey ntnAddr - , ToJSON ntnAddr - , ToJSONKey RelayAccessPoint - , Show ntnAddr - ) => LogFormatting (TraceLocalRootPeers PeerTrustable ntnAddr) where +instance LogFormatting CardanoTraceLocalRootPeers where forMachine _dtal (TraceLocalRootDomains groups) = mconcat [ "kind" .= String "LocalRootDomains" , "localRootDomains" .= toJSON groups @@ -215,7 +207,7 @@ instance MetaTrace TracePublicRootPeers where -- PeerSelection Tracer -------------------------------------------------------------------------------- -instance LogFormatting (TracePeerSelection Cardano.DebugPeerSelectionState PeerTrustable (Cardano.PublicRootPeers.ExtraPeers SockAddr) SockAddr) where +instance LogFormatting CardanoTracePeerSelection where forMachine _dtal (TraceLocalRootPeersChanged lrp lrp') = mconcat [ "kind" .= String "LocalRootPeersChanged" , "previous" .= toJSON lrp @@ -889,7 +881,7 @@ instance MetaTrace (TracePeerSelection extraDebugState extraFlags extraPeers Soc -- DebugPeerSelection Tracer -------------------------------------------------------------------------------- -instance LogFormatting (DebugPeerSelection Cardano.ExtraState PeerTrustable (Cardano.PublicRootPeers.ExtraPeers SockAddr) SockAddr) where +instance LogFormatting CardanoDebugPeerSelection where forMachine dtal@DNormal (TraceGovernorState blockedAt wakeupAfter st@PeerSelectionState { targets }) = mconcat [ "kind" .= String "DebugPeerSelection" From 3347940736874f8ee1a5f653bd0b9015a4920b5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Nicklisch-Franken?= Date: Fri, 5 Dec 2025 15:52:05 +0100 Subject: [PATCH 4/7] cardano-node: Fixes for #6388 --- .../Cardano/Node/Tracing/Tracers/Consensus.hs | 20 +++++-------------- .../src/Cardano/Node/Tracing/Tracers/P2P.hs | 1 + 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/cardano-node/src/Cardano/Node/Tracing/Tracers/Consensus.hs b/cardano-node/src/Cardano/Node/Tracing/Tracers/Consensus.hs index b32c7d4669e..51fbf4d2c3d 100644 --- a/cardano-node/src/Cardano/Node/Tracing/Tracers/Consensus.hs +++ b/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 diff --git a/cardano-node/src/Cardano/Node/Tracing/Tracers/P2P.hs b/cardano-node/src/Cardano/Node/Tracing/Tracers/P2P.hs index d9a320898a6..59635f95a29 100644 --- a/cardano-node/src/Cardano/Node/Tracing/Tracers/P2P.hs +++ b/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 From 250b2900a538c0e35ad7c1b189657d3271fd9aea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Nicklisch-Franken?= Date: Fri, 5 Dec 2025 16:32:28 +0100 Subject: [PATCH 5/7] Fix for Fixes for #6388 --- cardano-node/src/Cardano/Node/Tracing/Tracers/Consensus.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cardano-node/src/Cardano/Node/Tracing/Tracers/Consensus.hs b/cardano-node/src/Cardano/Node/Tracing/Tracers/Consensus.hs index 51fbf4d2c3d..fa4e08f3da6 100644 --- a/cardano-node/src/Cardano/Node/Tracing/Tracers/Consensus.hs +++ b/cardano-node/src/Cardano/Node/Tracing/Tracers/Consensus.hs @@ -743,7 +743,7 @@ instance MetaTrace (FetchDecision [Point header]) where 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 (Left FetchDeclineInFlightOtherPeer)) = Just Debug severityFor (Namespace _ ["Decline"]) _ = Just Info severityFor (Namespace _ ["Accept"]) _ = Just Info severityFor _ _ = Nothing From 9d94e4d1a42885f5c680137cae2a29c153edb785 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Nicklisch-Franken?= Date: Thu, 18 Dec 2025 17:15:04 +0100 Subject: [PATCH 6/7] Add MetaTrace for ConnectionHandlerTrace --- .../src/Cardano/Node/Tracing/Tracers/P2P.hs | 68 ++++++++++++------- 1 file changed, 45 insertions(+), 23 deletions(-) diff --git a/cardano-node/src/Cardano/Node/Tracing/Tracers/P2P.hs b/cardano-node/src/Cardano/Node/Tracing/Tracers/P2P.hs index 59635f95a29..deea64baec6 100644 --- a/cardano-node/src/Cardano/Node/Tracing/Tracers/P2P.hs +++ b/cardano-node/src/Cardano/Node/Tracing/Tracers/P2P.hs @@ -1248,9 +1248,8 @@ instance MetaTrace (PeerSelectionActionsTrace SockAddr lAddr) where -- Connection Manager Tracer -------------------------------------------------------------------------------- -instance (Show addr, Show versionNumber, Show agreedOptions, LogFormatting addr, - ToJSON addr, ToJSON versionNumber, ToJSON agreedOptions) - => LogFormatting (ConnectionManager.Trace addr (ConnectionHandlerTrace versionNumber agreedOptions)) where +instance (Show addr, LogFormatting addr, ToJSON addr, LogFormatting handler, Show handler) + => LogFormatting (ConnectionManager.Trace addr handler) where forMachine dtal (TrIncludeConnection prov peerAddr) = mconcat $ reverse [ "kind" .= String "IncludeConnection" @@ -1299,11 +1298,11 @@ instance (Show addr, Show versionNumber, Show agreedOptions, LogFormatting addr, , "provenance" .= String (pack . show $ prov) , "remoteAddress" .= forMachine dtal remoteAddress ] - forMachine dtal (TrConnectionHandler connId a) = + forMachine dtal (TrConnectionHandler connId handler) = mconcat [ "kind" .= String "ConnectionHandler" , "connectionId" .= toJSON connId - , "connectionHandler" .= forMachine dtal a + , "connectionHandler" .= forMachine dtal handler ] forMachine _dtal TrShutdown = mconcat @@ -1442,15 +1441,15 @@ instance (Show versionNumber, ToJSON versionNumber, ToJSON agreedOptions) , "command" .= show cerr ] -instance MetaTrace (ConnectionManager.Trace addr - (ConnectionHandlerTrace versionNumber agreedOptions)) where +instance MetaTrace handler => MetaTrace (ConnectionManager.Trace addr handler) where namespaceFor TrIncludeConnection {} = Namespace [] ["IncludeConnection"] namespaceFor TrReleaseConnection {} = Namespace [] ["UnregisterConnection"] namespaceFor TrConnect {} = Namespace [] ["Connect"] namespaceFor TrConnectError {} = Namespace [] ["ConnectError"] namespaceFor TrTerminatingConnection {} = Namespace [] ["TerminatingConnection"] namespaceFor TrTerminatedConnection {} = Namespace [] ["TerminatedConnection"] - namespaceFor TrConnectionHandler {} = Namespace [] ["ConnectionHandler"] + namespaceFor (TrConnectionHandler _ hdl) = + nsPrependInner "ConnectionHandler" (namespaceFor hdl) namespaceFor TrShutdown {} = Namespace [] ["Shutdown"] namespaceFor TrConnectionExists {} = Namespace [] ["ConnectionExists"] namespaceFor TrForbiddenConnection {} = Namespace [] ["ForbiddenConnection"] @@ -1472,17 +1471,8 @@ instance MetaTrace (ConnectionManager.Trace addr severityFor (Namespace _ ["ConnectError"]) _ = Just Info severityFor (Namespace _ ["TerminatingConnection"]) _ = Just Debug severityFor (Namespace _ ["TerminatedConnection"]) _ = Just Debug - severityFor (Namespace _ ["ConnectionHandler"]) - (Just (TrConnectionHandler _ ev')) = Just $ - case ev' of - TrHandshakeSuccess {} -> Info - TrHandshakeQuery {} -> Info - TrHandshakeClientError {} -> Notice - TrHandshakeServerError {} -> Info - TrConnectionHandlerError _ _ ShutdownNode -> Critical - TrConnectionHandlerError _ _ ShutdownPeer -> Info - severityFor (Namespace _ ["ConnectionHandler"]) _ = Just Info - severityFor (Namespace _ ["ConnectionHandler"]) Nothing = Just Info + severityFor (Namespace out ("ConnectionHandler" : tl)) (Just (TrConnectionHandler _ hdl)) = + severityFor (Namespace out tl) (Just hdl) severityFor (Namespace _ ["Shutdown"]) _ = Just Info severityFor (Namespace _ ["ConnectionExists"]) _ = Just Info severityFor (Namespace _ ["ForbiddenConnection"]) _ = Just Info @@ -1504,7 +1494,8 @@ instance MetaTrace (ConnectionManager.Trace addr documentFor (Namespace _ ["ConnectError"]) = Just "" documentFor (Namespace _ ["TerminatingConnection"]) = Just "" documentFor (Namespace _ ["TerminatedConnection"]) = Just "" - documentFor (Namespace _ ["ConnectionHandler"]) = Just "" + documentFor (Namespace out ("ConnectionHandler" : tl)) = + documentFor (Namespace out tl :: Namespace handler) documentFor (Namespace _ ["Shutdown"]) = Just "" documentFor (Namespace _ ["ConnectionExists"]) = Just "" documentFor (Namespace _ ["ForbiddenConnection"]) = Just "" @@ -1537,7 +1528,6 @@ instance MetaTrace (ConnectionManager.Trace addr , Namespace [] ["ConnectError"] , Namespace [] ["TerminatingConnection"] , Namespace [] ["TerminatedConnection"] - , Namespace [] ["ConnectionHandler"] , Namespace [] ["Shutdown"] , Namespace [] ["ConnectionExists"] , Namespace [] ["ForbiddenConnection"] @@ -1550,8 +1540,40 @@ instance MetaTrace (ConnectionManager.Trace addr , Namespace [] ["ConnectionTimeWaitDone"] , Namespace [] ["ConnectionManagerCounters"] , Namespace [] ["State"] - , Namespace [] ["UnexpectedlyFalseAssertion"] - ] + , Namespace [] ["UnexpectedlyFalseAssertion"]] + ++ map (nsPrependInner "ConnectionHandler") + (allNamespaces :: [Namespace handler]) + + +instance MetaTrace (ConnectionHandlerTrace versionNumber agreedOptions) where + namespaceFor TrHandshakeSuccess {} = Namespace [] ["HandshakeSuccess"] + namespaceFor TrHandshakeQuery {} = Namespace [] ["HandshakeQuery"] + namespaceFor TrHandshakeClientError {} = Namespace [] ["HandshakeClientError"] + namespaceFor TrHandshakeServerError {} = Namespace [] ["HandshakeServerError"] + namespaceFor TrConnectionHandlerError {} = Namespace [] ["Error"] + + severityFor (Namespace _ ["HandshakeSuccess"]) _ = Just Info + severityFor (Namespace _ ["HandshakeQuery"]) _ = Just Info + severityFor (Namespace _ ["HandshakeClientError"]) _ = Just Notice + severityFor (Namespace _ ["HandshakeServerError"]) _ = Just Info + severityFor (Namespace _ ["Error"]) (Just (TrConnectionHandlerError _ _ ShutdownNode)) = Just Critical + severityFor (Namespace _ ["Error"]) (Just (TrConnectionHandlerError _ _ ShutdownPeer)) = Just Info + severityFor _ _ = Nothing + + documentFor (Namespace _ ["HandshakeSuccess"]) = Just "" + documentFor (Namespace _ ["HandshakeQuery"]) = Just "" + documentFor (Namespace _ ["HandshakeClientError"]) = Just "" + documentFor (Namespace _ ["HandshakeServerError"]) = Just "" + documentFor (Namespace _ ["Error"]) = Just "" + documentFor _ = Nothing + + allNamespaces = [ + Namespace [] ["HandshakeSuccess"] + , Namespace [] ["HandshakeQuery"] + , Namespace [] ["HandshakeClientError"] + , Namespace [] ["HandshakeServerError"] + , Namespace [] ["Error"] + ] -------------------------------------------------------------------------------- -- Connection Manager Transition Tracer From a6a513ca97608f6f7b441248baeff2d772c92435 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Nicklisch-Franken?= Date: Thu, 18 Dec 2025 20:26:52 +0100 Subject: [PATCH 7/7] MetaTrace fixes --- cardano-node/src/Cardano/Node/Tracing/Tracers/P2P.hs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cardano-node/src/Cardano/Node/Tracing/Tracers/P2P.hs b/cardano-node/src/Cardano/Node/Tracing/Tracers/P2P.hs index deea64baec6..709beae76b4 100644 --- a/cardano-node/src/Cardano/Node/Tracing/Tracers/P2P.hs +++ b/cardano-node/src/Cardano/Node/Tracing/Tracers/P2P.hs @@ -1473,6 +1473,7 @@ instance MetaTrace handler => MetaTrace (ConnectionManager.Trace addr handler) w severityFor (Namespace _ ["TerminatedConnection"]) _ = Just Debug severityFor (Namespace out ("ConnectionHandler" : tl)) (Just (TrConnectionHandler _ hdl)) = severityFor (Namespace out tl) (Just hdl) + severityFor (Namespace _ ("ConnectionHandler" : _)) Nothing = Just Info severityFor (Namespace _ ["Shutdown"]) _ = Just Info severityFor (Namespace _ ["ConnectionExists"]) _ = Just Info severityFor (Namespace _ ["ForbiddenConnection"]) _ = Just Info @@ -1558,6 +1559,7 @@ instance MetaTrace (ConnectionHandlerTrace versionNumber agreedOptions) where severityFor (Namespace _ ["HandshakeServerError"]) _ = Just Info severityFor (Namespace _ ["Error"]) (Just (TrConnectionHandlerError _ _ ShutdownNode)) = Just Critical severityFor (Namespace _ ["Error"]) (Just (TrConnectionHandlerError _ _ ShutdownPeer)) = Just Info + severityFor (Namespace _ ["Error"]) Nothing = Just Info severityFor _ _ = Nothing documentFor (Namespace _ ["HandshakeSuccess"]) = Just ""