diff --git a/cardano-node/src/Cardano/Node/Tracing.hs b/cardano-node/src/Cardano/Node/Tracing.hs index ba9d268de4b..027d988d086 100644 --- a/cardano-node/src/Cardano/Node/Tracing.hs +++ b/cardano-node/src/Cardano/Node/Tracing.hs @@ -16,6 +16,8 @@ import Cardano.Node.Tracing.StateRep (NodeState) import Cardano.Node.Tracing.Tracers.ConsensusStartupException (ConsensusStartupException (..)) import Cardano.Node.Tracing.Tracers.Peer (PeerT) +import Cardano.Node.Tracing.Tracers.NodeVersion (NodeVersionTrace) + import qualified Ouroboros.Consensus.Network.NodeToClient as NodeToClient import qualified Ouroboros.Consensus.Network.NodeToNode as NodeToNode import qualified Ouroboros.Consensus.Node.Tracers as Consensus @@ -46,10 +48,9 @@ data Tracers peer localPeer blk p2p = Tracers , diffusionTracersExtra :: !(Diffusion.ExtraTracers p2p) , startupTracer :: !(Tracer IO (StartupTrace blk)) - , nodeVersionTracer :: !(Tracer IO NodeVersion) , shutdownTracer :: !(Tracer IO ShutdownTrace) , nodeInfoTracer :: !(Tracer IO NodeInfo) - , nodeVersionTracer :: !(Tracer IO NodeVersion) + , nodeVersionTracer :: !(Tracer IO NodeVersionTrace) , nodeStartupInfoTracer :: !(Tracer IO NodeStartupInfo) , nodeStateTracer :: !(Tracer IO NodeState) , resourcesTracer :: !(Tracer IO ResourceStats) diff --git a/cardano-node/src/Cardano/Node/Tracing/Tracers.hs b/cardano-node/src/Cardano/Node/Tracing/Tracers.hs index b62ed90e8ac..9dbbeef149d 100644 --- a/cardano-node/src/Cardano/Node/Tracing/Tracers.hs +++ b/cardano-node/src/Cardano/Node/Tracing/Tracers.hs @@ -125,6 +125,10 @@ mkDispatchTracers nodeKernel trBase trForward mbTrEKG trDataPoint trConfig enabl !chainDBTr <- mkCardanoTracer' trBase trForward mbTrEKG ["ChainDB"] withAddedToCurrentChainEmptyLimited configureTracers configReflection trConfig [chainDBTr] + + nodeVersionTr <- mkCardanoTracer trBase trForward mbTrEKG ["Version"] + configureTracers configReflection trConfig [nodeVersionTr] + -- Filter out replayed blocks for this tracer let chainDBTr' = filterTrace (\case (_, ChainDB.TraceLedgerReplayEvent @@ -188,6 +192,7 @@ mkDispatchTracers nodeKernel trBase trForward mbTrEKG trDataPoint trConfig enabl , nodeStartupInfoTracer = Tracer (traceWith nodeStartupInfoDP) , nodeStateTracer = Tracer (traceWith stateTr) <> Tracer (traceWith nodeStateDP) + , nodeVersionTracer = Tracer (traceWith nodeVersionTr) , resourcesTracer = Tracer (traceWith resourcesTr) , peersTracer = Tracer (traceWith peersTr) <> Tracer (traceNodePeers nodePeersDP) diff --git a/cardano-node/src/Cardano/Node/Tracing/Tracers/NodeVersion.hs b/cardano-node/src/Cardano/Node/Tracing/Tracers/NodeVersion.hs index e680a14ace8..fc736af5401 100644 --- a/cardano-node/src/Cardano/Node/Tracing/Tracers/NodeVersion.hs +++ b/cardano-node/src/Cardano/Node/Tracing/Tracers/NodeVersion.hs @@ -8,6 +8,7 @@ module Cardano.Node.Tracing.Tracers.NodeVersion ( NodeVersionTrace (..) , getNodeVersion + , NodeVersionTrace(..) ) where diff --git a/cardano-node/src/Cardano/Tracing/Tracers.hs b/cardano-node/src/Cardano/Tracing/Tracers.hs index 497e4879d0e..99eabc81f62 100644 --- a/cardano-node/src/Cardano/Tracing/Tracers.hs +++ b/cardano-node/src/Cardano/Tracing/Tracers.hs @@ -161,6 +161,7 @@ nullTracersP2P = Tracers , nodeInfoTracer = nullTracer , nodeStartupInfoTracer = nullTracer , nodeStateTracer = nullTracer + , nodeVersionTracer = nullTracer , resourcesTracer = nullTracer , peersTracer = nullTracer } @@ -178,6 +179,7 @@ nullTracersNonP2P = Tracers , nodeInfoTracer = nullTracer , nodeStartupInfoTracer = nullTracer , nodeStateTracer = nullTracer + , nodeVersionTracer = nullTracer , resourcesTracer = nullTracer , peersTracer = nullTracer } @@ -341,6 +343,7 @@ mkTracers blockConfig tOpts@(TracingOnLegacy trSel) tr nodeKern ekgDirect enable , nodeInfoTracer = nullTracer , nodeStartupInfoTracer = nullTracer , nodeStateTracer = nullTracer + , nodeVersionTracer = nullTracer , resourcesTracer = nullTracer , peersTracer = nullTracer } @@ -486,6 +489,7 @@ mkTracers _ _ _ _ _ enableP2P = , nodeInfoTracer = nullTracer , nodeStartupInfoTracer = nullTracer , nodeStateTracer = nullTracer + , nodeVersionTracer = nullTracer , resourcesTracer = nullTracer , peersTracer = nullTracer }