Skip to content

Commit d90c2a6

Browse files
committed
Added KeepAlive tracer
I also left TODO notes to add PeerSharing tracer.
1 parent e46ab02 commit d90c2a6

File tree

1 file changed

+9
-3
lines changed
  • ouroboros-consensus-diffusion/src/ouroboros-consensus-diffusion/Ouroboros/Consensus/Network

1 file changed

+9
-3
lines changed

ouroboros-consensus-diffusion/src/ouroboros-consensus-diffusion/Ouroboros/Consensus/Network/NodeToNode.hs

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -375,6 +375,7 @@ data Tracers' peer blk e f = Tracers {
375375
, tBlockFetchTracer :: f (TraceLabelPeer peer (TraceSendRecv (BlockFetch blk (Point blk))))
376376
, tBlockFetchSerialisedTracer :: f (TraceLabelPeer peer (TraceSendRecv (BlockFetch (Serialised blk) (Point blk))))
377377
, tTxSubmission2Tracer :: f (TraceLabelPeer peer (TraceSendRecv (TxSubmission2 (GenTxId blk) (GenTx blk))))
378+
, tKeepAliveTracer :: f (TraceLabelPeer peer (TraceSendRecv KeepAlive))
378379
}
379380

380381
instance (forall a. Semigroup (f a)) => Semigroup (Tracers' peer blk e f) where
@@ -384,6 +385,7 @@ instance (forall a. Semigroup (f a)) => Semigroup (Tracers' peer blk e f) where
384385
, tBlockFetchTracer = f tBlockFetchTracer
385386
, tBlockFetchSerialisedTracer = f tBlockFetchSerialisedTracer
386387
, tTxSubmission2Tracer = f tTxSubmission2Tracer
388+
, tKeepAliveTracer = f tKeepAliveTracer
387389
}
388390
where
389391
f :: forall a. Semigroup a
@@ -399,6 +401,7 @@ nullTracers = Tracers {
399401
, tBlockFetchTracer = nullTracer
400402
, tBlockFetchSerialisedTracer = nullTracer
401403
, tTxSubmission2Tracer = nullTracer
404+
, tKeepAliveTracer = nullTracer
402405
}
403406

404407
showTracers :: ( Show blk
@@ -416,6 +419,7 @@ showTracers tr = Tracers {
416419
, tBlockFetchTracer = showTracing tr
417420
, tBlockFetchSerialisedTracer = showTracing tr
418421
, tTxSubmission2Tracer = showTracing tr
422+
, tKeepAliveTracer = showTracing tr
419423
}
420424

421425
{-------------------------------------------------------------------------------
@@ -716,7 +720,7 @@ mkApps kernel Tracers {..} mkCodecs ByteLimits {..} genChainSyncTimeout lopBucke
716720
labelThisThread "KeepAliveClient"
717721
let kacApp = \dqCtx ->
718722
runPeerWithLimits
719-
nullTracer
723+
(TraceLabelPeer them `contramap` tKeepAliveTracer)
720724
(cKeepAliveCodec (mkCodecs version))
721725
blKeepAlive
722726
timeLimitsKeepAlive
@@ -733,10 +737,10 @@ mkApps kernel Tracers {..} mkCodecs ByteLimits {..} genChainSyncTimeout lopBucke
733737
-> ResponderContext addrNTN
734738
-> Channel m bKA
735739
-> m ((), Maybe bKA)
736-
aKeepAliveServer version _responderCtx channel = do
740+
aKeepAliveServer version ResponderContext { rcConnectionId = them } channel = do
737741
labelThisThread "KeepAliveServer"
738742
runPeerWithLimits
739-
nullTracer
743+
(TraceLabelPeer them `contramap` tKeepAliveTracer)
740744
(cKeepAliveCodec (mkCodecs version))
741745
(byteLimitsKeepAlive (const 0)) -- TODO: Real Bytelimits, see #1727
742746
timeLimitsKeepAlive
@@ -760,6 +764,7 @@ mkApps kernel Tracers {..} mkCodecs ByteLimits {..} genChainSyncTimeout lopBucke
760764
$ \controller -> do
761765
psClient <- hPeerSharingClient version controlMessageSTM them controller
762766
((), trailing) <- runPeerWithLimits
767+
-- TODO: add tracer
763768
nullTracer
764769
(cPeerSharingCodec (mkCodecs version))
765770
(byteLimitsPeerSharing (const 0))
@@ -776,6 +781,7 @@ mkApps kernel Tracers {..} mkCodecs ByteLimits {..} genChainSyncTimeout lopBucke
776781
aPeerSharingServer version ResponderContext { rcConnectionId = them } channel = do
777782
labelThisThread "PeerSharingServer"
778783
runPeerWithLimits
784+
-- TODO: add tracer
779785
nullTracer
780786
(cPeerSharingCodec (mkCodecs version))
781787
(byteLimitsPeerSharing (const 0))

0 commit comments

Comments
 (0)