Skip to content

Commit b79718e

Browse files
ch1boch1bo
authored
Merge pull request #6397 from IntersectMBO/ch1bo/leios-consistent-traces
More consistent traces between immdb-server and cardano-node
2 parents 5c62bb9 + b6a9eb6 commit b79718e

File tree

4 files changed

+28
-119
lines changed

4 files changed

+28
-119
lines changed

‎cabal.project‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,15 +101,12 @@ constraints:
101101
source-repository-package
102102
type: git
103103
location: https://github.com/IntersectMBO/ouroboros-consensus
104-
tag: a2e3c598b96efa1e2add0bc7b893a7a007ace606
105-
--sha256: sha256-uMImzqUvdDCyuso/fN0BEJuhj1BuT8U1Gafbhz4CBRU=
104+
tag: ed637941fc1a252ecdf2a1b1600ef95d17b52101
105+
--sha256: sha256-hvK7R9f28LV9daPn7PFBJZexh2cbsZGDYEGNdvew4nw=
106106
subdir:
107107
ouroboros-consensus
108108
ouroboros-consensus-cardano
109-
ouroboros-consensus-protocol
110109
ouroboros-consensus-diffusion
111-
sop-extras
112-
strict-sop-core
113110

114111
-- Points to ouroboros-network/nfrisby/leios-202511-demo
115112
source-repository-package

‎cardano-node/cardano-node.cabal‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,6 @@ library
226226
, transformers-except
227227
, typed-protocols >= 0.3
228228
, typed-protocols-stateful >= 0.3
229-
, vector
230229
, yaml
231230

232231
executable cardano-node

‎cardano-node/src/Cardano/Node/Tracing/Tracers/NodeToNode.hs‎

Lines changed: 7 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -23,23 +23,22 @@ import Ouroboros.Network.Block (Point, Serialised (..), blockHash)
2323
import Ouroboros.Network.DeltaQ (GSV (..), PeerGSV (..))
2424
import Ouroboros.Network.KeepAlive (TraceKeepAliveClient (..))
2525
import Ouroboros.Network.Protocol.BlockFetch.Type (BlockFetch (..), Message (..))
26-
import qualified Ouroboros.Network.Protocol.TxSubmission2.Type as STX
2726
import qualified Ouroboros.Network.Protocol.KeepAlive.Type as KA
2827
import qualified Ouroboros.Network.Protocol.PeerSharing.Type as PS
28+
import qualified Ouroboros.Network.Protocol.TxSubmission2.Type as STX
2929
import Ouroboros.Network.SizeInBytes (SizeInBytes (..))
3030

3131
import Control.Monad.Class.MonadTime.SI (Time (..))
32-
import Data.Aeson (ToJSON (..), Value (Array, Number, String), (.=))
32+
import Data.Aeson (ToJSON (..), Value (String), (.=))
3333
import Data.Proxy (Proxy (..))
34-
import Data.Time (DiffTime)
3534
import Data.Text (pack)
35+
import Data.Time (DiffTime)
3636
import Network.TypedProtocol.Codec (AnyMessage (AnyMessageAndAgency))
3737

38-
import qualified Data.Bits as Bits
39-
import qualified Data.Vector as V
40-
import LeiosDemoTypes (EbHash (..), LeiosEb, LeiosPoint (..), LeiosTx, leiosEbBytesSize, leiosTxBytesSize, prettyBitmap, prettyEbHash)
4138
import qualified LeiosDemoOnlyTestFetch as LF
4239
import qualified LeiosDemoOnlyTestNotify as LN
40+
import LeiosDemoTypes (EbHash (..), LeiosEb, LeiosPoint (..), LeiosTx,
41+
messageLeiosFetchToObject, prettyEbHash)
4342

4443
--------------------------------------------------------------------------------
4544
-- BlockFetch Tracer
@@ -508,49 +507,8 @@ instance LogFormatting (AnyMessage (LN.LeiosNotify LeiosPoint ())) where
508507
instance LogFormatting (AnyMessage (LF.LeiosFetch LeiosPoint LeiosEb LeiosTx)) where
509508
forHuman = showT
510509

511-
forMachine _dtal (AnyMessageAndAgency _stok msg) = case msg of
512-
513-
LF.MsgLeiosBlockRequest (MkLeiosPoint ebSlot ebHash) ->
514-
mconcat [ "kind" .= String "MsgLeiosBlockRequest"
515-
, "ebSlot" .= ebSlot
516-
, "ebHash" .= ebHash
517-
]
518-
519-
LF.MsgLeiosBlock eb ->
520-
mconcat [ "kind" .= String "MsgLeiosBlock"
521-
, "eb" .= String "<elided>"
522-
, "ebBytesSize" .= Number (fromIntegral $ leiosEbBytesSize eb)
523-
]
524-
525-
LF.MsgLeiosBlockTxsRequest (MkLeiosPoint ebSlot ebHash) bitmaps ->
526-
mconcat [ "kind" .= String "MsgLeiosBlockTxsRequest"
527-
, "ebSlot" .= ebSlot
528-
, "ebHash" .= ebHash
529-
, "numTxs" .= Number (fromIntegral $ sum $ map (Bits.popCount . snd) bitmaps)
530-
, "bitmaps" .= Array (V.fromList $ map (String . pack . prettyBitmap) bitmaps)
531-
]
532-
533-
LF.MsgLeiosBlockTxs txs ->
534-
mconcat [ "kind" .= String "MsgLeiosBlockTxs"
535-
, "numTxs" .= Number (fromIntegral (V.length txs))
536-
, "txsBytesSize" .= Number (fromIntegral $ V.sum $ V.map leiosTxBytesSize txs)
537-
, "txs" .= String "<elided>"
538-
]
539-
540-
-- LF.MsgLeiosVotesRequest
541-
-- LF.MsgLeiosVoteDelivery
542-
543-
-- LF.MsgLeiosBlockRangeRequest
544-
-- LF.MsgLeiosNextBlockAndTxsInRange
545-
-- LF.MsgLeiosLastBlockAndTxsInRange
546-
547-
LF.MsgDone ->
548-
mconcat [ "kind" .= String "MsgDone"
549-
]
550-
551-
where
552-
-- agency :: Aeson.Object
553-
-- agency = "agency" .= show stok
510+
forMachine _dtal (AnyMessageAndAgency _stok msg) =
511+
messageLeiosFetchToObject msg
554512

555513
instance MetaTrace (AnyMessage (LN.LeiosNotify LeiosPoint ())) where
556514
namespaceFor (AnyMessageAndAgency _stok msg) = case msg of

‎cardano-node/src/Cardano/Tracing/OrphanInstances/Network.hs‎

Lines changed: 19 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -27,20 +27,20 @@ module Cardano.Tracing.OrphanInstances.Network
2727
, FetchDecisionToJSON (..)
2828
) where
2929

30+
import Cardano.Network.PeerSelection.Bootstrap (UseBootstrapPeers (..))
31+
import Cardano.Network.PeerSelection.PeerTrustable (PeerTrustable (..))
32+
import Cardano.Network.Types (LedgerStateJudgement (..))
3033
import Cardano.Node.Queries (ConvertTxId)
3134
import Cardano.Tracing.OrphanInstances.Common
3235
import Cardano.Tracing.Render
36+
import qualified Ouroboros.Cardano.Network.PeerSelection.Governor.PeerSelectionState as Cardano
37+
import qualified Ouroboros.Cardano.Network.PeerSelection.Governor.Types as Cardano
38+
import qualified Ouroboros.Cardano.Network.PublicRootPeers as Cardano.PublicRootPeers
3339
import Ouroboros.Consensus.Block (ConvertRawHash (..), Header, getHeader)
3440
import Ouroboros.Consensus.Ledger.Query (BlockQuery, Query)
3541
import Ouroboros.Consensus.Ledger.SupportsMempool (ApplyTxErr, GenTx, GenTxId,
3642
HasTxs (..), TxId, txId)
3743
import Ouroboros.Consensus.Node.Run (RunNode, estimateBlockSize)
38-
import Cardano.Network.PeerSelection.Bootstrap (UseBootstrapPeers(..))
39-
import Cardano.Network.PeerSelection.PeerTrustable (PeerTrustable(..))
40-
import Cardano.Network.Types (LedgerStateJudgement(..))
41-
import qualified Ouroboros.Cardano.Network.PeerSelection.Governor.PeerSelectionState as Cardano
42-
import qualified Ouroboros.Cardano.Network.PeerSelection.Governor.Types as Cardano
43-
import qualified Ouroboros.Cardano.Network.PublicRootPeers as Cardano.PublicRootPeers
4444
import qualified Ouroboros.Network.AnchoredFragment as AF
4545
import qualified Ouroboros.Network.AnchoredSeq as AS
4646
import Ouroboros.Network.Block
@@ -51,15 +51,14 @@ import Ouroboros.Network.BlockFetch.Decision (FetchDecision, FetchDecl
5151
import qualified Ouroboros.Network.BlockFetch.Decision.Trace as BlockFetch
5252
import Ouroboros.Network.ConnectionHandler (ConnectionHandlerTrace (..))
5353
import Ouroboros.Network.ConnectionId (ConnectionId (..))
54-
import Ouroboros.Network.ConnectionManager.Core as ConnMgr (Trace (..))
5554
import Ouroboros.Network.ConnectionManager.ConnMap (ConnMap (..), LocalAddr (..))
55+
import Ouroboros.Network.ConnectionManager.Core as ConnMgr (Trace (..))
5656
import Ouroboros.Network.ConnectionManager.State (ConnStateId (..))
5757
import Ouroboros.Network.ConnectionManager.Types (AbstractState (..),
58-
ConnectionManagerCounters (..),
59-
OperationResult (..))
58+
ConnectionManagerCounters (..), OperationResult (..))
6059
import qualified Ouroboros.Network.ConnectionManager.Types as ConnMgr
61-
import qualified Ouroboros.Network.Diffusion.Common as Diffusion
6260
import Ouroboros.Network.DeltaQ (GSV (..), PeerGSV (..))
61+
import qualified Ouroboros.Network.Diffusion.Common as Diffusion
6362
import Ouroboros.Network.Driver.Limits (ProtocolLimitFailure (..))
6463
import qualified Ouroboros.Network.Driver.Stateful as Stateful
6564
import Ouroboros.Network.ExitPolicy (RepromoteDelay (..))
@@ -73,10 +72,10 @@ import qualified Ouroboros.Network.NodeToClient as NtC
7372
import Ouroboros.Network.NodeToNode (ErrorPolicyTrace (..), NodeToNodeVersion (..),
7473
NodeToNodeVersionData (..), RemoteAddress, TraceSendRecv (..), WithAddr (..))
7574
import qualified Ouroboros.Network.NodeToNode as NtN
76-
import Ouroboros.Network.PeerSelection.Governor (AssociationMode (..), DebugPeerSelection (..),
77-
DebugPeerSelectionState (..), PeerSelectionCounters, PeerSelectionState (..),
78-
PeerSelectionTargets (..), PeerSelectionView (..), TracePeerSelection (..),
79-
peerSelectionStateToCounters)
75+
import Ouroboros.Network.PeerSelection.Governor (AssociationMode (..),
76+
DebugPeerSelection (..), DebugPeerSelectionState (..), PeerSelectionCounters,
77+
PeerSelectionState (..), PeerSelectionTargets (..), PeerSelectionView (..),
78+
TracePeerSelection (..), peerSelectionStateToCounters)
8079
import Ouroboros.Network.PeerSelection.LedgerPeers
8180
import Ouroboros.Network.PeerSelection.PeerSharing (PeerSharing (..))
8281
import Ouroboros.Network.PeerSelection.PeerStateActions (PeerSelectionActionsTrace (..))
@@ -89,7 +88,7 @@ import Ouroboros.Network.PeerSelection.RootPeersDNS.PublicRootPeers
8988
import Ouroboros.Network.PeerSelection.State.KnownPeers (KnownPeerInfo (..))
9089
import qualified Ouroboros.Network.PeerSelection.State.KnownPeers as KnownPeers
9190
import Ouroboros.Network.PeerSelection.State.LocalRootPeers (HotValency (..),
92-
LocalRootPeers, WarmValency (..), LocalRootConfig (..))
91+
LocalRootConfig (..), LocalRootPeers, WarmValency (..))
9392
import qualified Ouroboros.Network.PeerSelection.State.LocalRootPeers as LocalRootPeers
9493
import Ouroboros.Network.PeerSelection.Types (PeerStatus (..))
9594
import Ouroboros.Network.Protocol.BlockFetch.Type (BlockFetch, Message (..))
@@ -140,14 +139,11 @@ import Network.Socket (SockAddr (..))
140139
import Network.TypedProtocol.Codec (AnyMessage (AnyMessageAndAgency))
141140
import qualified Network.TypedProtocol.Stateful.Codec as Stateful
142141

143-
{- HLINT ignore "Use record patterns" -}
144-
145-
import qualified Data.Bits as Bits
146-
import qualified Data.Vector as V
147-
import LeiosDemoTypes (EbHash (..), LeiosEb, LeiosPoint (..), LeiosTx, leiosEbBytesSize, leiosTxBytesSize, prettyBitmap, prettyEbHash)
148-
import LeiosDemoTypes (TraceLeiosKernel, TraceLeiosPeer, traceLeiosKernelToObject, traceLeiosPeerToObject)
149142
import qualified LeiosDemoOnlyTestFetch as LF
150143
import qualified LeiosDemoOnlyTestNotify as LN
144+
import LeiosDemoTypes (EbHash (..), LeiosEb, LeiosPoint (..), LeiosTx, TraceLeiosKernel,
145+
TraceLeiosPeer, messageLeiosFetchToObject, prettyEbHash,
146+
traceLeiosKernelToObject, traceLeiosPeerToObject)
151147

152148
--
153149
-- * instances of @HasPrivacyAnnotation@ and @HasSeverityAnnotation@
@@ -2924,49 +2920,8 @@ instance ToObject peer
29242920
trTransformer = trStructured
29252921

29262922
instance ToObject (AnyMessage (LF.LeiosFetch LeiosPoint LeiosEb LeiosTx)) where
2927-
toObject _verb (AnyMessageAndAgency _stok msg) = case msg of
2928-
2929-
LF.MsgLeiosBlockRequest (MkLeiosPoint ebSlot ebHash) ->
2930-
mconcat [ "kind" .= String "MsgLeiosBlockRequest"
2931-
, "ebSlot" .= ebSlot
2932-
, "ebHash" .= ebHash
2933-
]
2934-
2935-
LF.MsgLeiosBlock eb ->
2936-
mconcat [ "kind" .= String "MsgLeiosBlock"
2937-
, "eb" .= String "<elided>"
2938-
, "ebBytesSize" .= Number (fromIntegral $ leiosEbBytesSize eb)
2939-
]
2940-
2941-
LF.MsgLeiosBlockTxsRequest (MkLeiosPoint ebSlot ebHash) bitmaps ->
2942-
mconcat [ "kind" .= String "MsgLeiosBlockTxsRequest"
2943-
, "ebSlot" .= ebSlot
2944-
, "ebHash" .= ebHash
2945-
, "numTxs" .= Number (fromIntegral $ sum $ map (Bits.popCount . snd) bitmaps)
2946-
, "bitmaps" .= Array (V.fromList $ map (String . pack . prettyBitmap) bitmaps)
2947-
]
2948-
2949-
LF.MsgLeiosBlockTxs txs ->
2950-
mconcat [ "kind" .= String "MsgLeiosBlockTxs"
2951-
, "numTxs" .= Number (fromIntegral (V.length txs))
2952-
, "txsBytesSize" .= Number (fromIntegral $ V.sum $ V.map leiosTxBytesSize txs)
2953-
, "txs" .= String "<elided>"
2954-
]
2955-
2956-
-- LF.MsgLeiosVotesRequest
2957-
-- LF.MsgLeiosVoteDelivery
2958-
2959-
-- LF.MsgLeiosBlockRangeRequest
2960-
-- LF.MsgLeiosNextBlockAndTxsInRange
2961-
-- LF.MsgLeiosLastBlockAndTxsInRange
2962-
2963-
LF.MsgDone ->
2964-
mconcat [ "kind" .= String "MsgDone"
2965-
]
2966-
2967-
where
2968-
-- agency :: Aeson.Object
2969-
-- agency = "agency" .= show stok
2923+
toObject _verb (AnyMessageAndAgency _stok msg) =
2924+
messageLeiosFetchToObject msg
29702925

29712926
instance Transformable Text IO TraceLeiosKernel where
29722927
trTransformer = trStructured

0 commit comments

Comments
 (0)