Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CAD-2907 Tracing: more details #2710

Merged
merged 1 commit into from
May 19, 2021
Merged

CAD-2907 Tracing: more details #2710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 15 additions & 9 deletions cardano-node/src/Cardano/Tracing/OrphanInstances/Consensus.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import Cardano.Slotting.Slot (fromWithOrigin)

import Ouroboros.Consensus.Block (BlockProtocol, CannotForge, ConvertRawHash (..),
ForgeStateUpdateError, Header, RealPoint, getHeader, headerPoint, realPointHash,
realPointSlot)
realPointSlot, blockNo, blockPrevHash, pointHash)
import Ouroboros.Consensus.HeaderValidation
import Ouroboros.Consensus.Ledger.Abstract
import Ouroboros.Consensus.Ledger.Extended
Expand All @@ -40,7 +40,7 @@ import Ouroboros.Consensus.Ledger.SupportsMempool (ApplyTxErr, GenTx,
LedgerSupportsMempool, TxId, txForgetValidated, txId)
import Ouroboros.Consensus.Ledger.SupportsProtocol (LedgerSupportsProtocol)
import Ouroboros.Consensus.Mempool.API (MempoolSize (..), TraceEventMempool (..))
import Ouroboros.Consensus.MiniProtocol.BlockFetch.Server (TraceBlockFetchServerEvent)
import Ouroboros.Consensus.MiniProtocol.BlockFetch.Server (TraceBlockFetchServerEvent (..))
import Ouroboros.Consensus.MiniProtocol.ChainSync.Client (TraceChainSyncClientEvent (..))
import Ouroboros.Consensus.MiniProtocol.ChainSync.Server (TraceChainSyncServerEvent (..))
import Ouroboros.Consensus.MiniProtocol.LocalTxSubmission.Server
Expand Down Expand Up @@ -216,7 +216,8 @@ instance (LedgerSupportsProtocol blk)
formatText _ = pack . show . toList


instance Transformable Text IO (TraceBlockFetchServerEvent blk) where
instance ConvertRawHash blk
=> Transformable Text IO (TraceBlockFetchServerEvent blk) where
trTransformer = trStructuredText


Expand Down Expand Up @@ -963,9 +964,11 @@ instance ( ConvertRawHash blk
, "files" .= String (Text.pack . show $ map show fsPaths)
]

instance ToObject (TraceBlockFetchServerEvent blk) where
toObject _verb _ =
mkObject [ "kind" .= String "TraceBlockFetchServerEvent" ]
instance ConvertRawHash blk => ToObject (TraceBlockFetchServerEvent blk) where
toObject _verb (TraceBlockFetchServerSendBlock blk) =
mkObject [ "kind" .= String "TraceBlockFetchServerSendBlock"
, "block" .= String (renderChainHash @blk (renderHeaderHash (Proxy @blk)) $ pointHash blk)
]


instance (ConvertRawHash blk, LedgerSupportsProtocol blk)
Expand Down Expand Up @@ -1141,10 +1144,13 @@ instance ( tx ~ GenTx blk
[ "kind" .= String "TraceNodeIsLeader"
, "slot" .= toJSON (unSlotNo slotNo)
]
toObject _verb (TraceForgedBlock slotNo _ _ _) =
toObject _verb (TraceForgedBlock slotNo _ blk _) =
mkObject
[ "kind" .= String "TraceForgedBlock"
, "slot" .= toJSON (unSlotNo slotNo)
[ "kind" .= String "TraceForgedBlock"
, "slot" .= toJSON (unSlotNo slotNo)
, "block" .= String (renderHeaderHash (Proxy @blk) $ blockHash blk)
, "blockNo" .= toJSON (unBlockNo $ blockNo blk)
, "blockPrev" .= String (renderChainHash @blk (renderHeaderHash (Proxy @blk)) $ blockPrevHash blk)
]
toObject _verb (TraceDidntAdoptBlock slotNo _) =
mkObject
Expand Down
11 changes: 8 additions & 3 deletions cardano-node/src/Cardano/Tracing/OrphanInstances/Network.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -712,13 +712,18 @@ instance ToObject SlotNo where
, "slot" .= toJSON (unSlotNo slot) ]


instance ToObject (TraceFetchClientState header) where
instance ConvertRawHash header => ToObject (TraceFetchClientState header) where
toObject _verb BlockFetch.AddedFetchRequest {} =
mkObject [ "kind" .= String "AddedFetchRequest" ]
toObject _verb BlockFetch.AcknowledgedFetchRequest {} =
mkObject [ "kind" .= String "AcknowledgedFetchRequest" ]
toObject _verb BlockFetch.CompletedBlockFetch {} =
mkObject [ "kind" .= String "CompletedBlockFetch" ]
toObject _verb (BlockFetch.CompletedBlockFetch pt _ _ _ _) =
mkObject [ "kind" .= String "CompletedBlockFetch"
, "block" .= String
(case pt of
GenesisPoint -> "Genesis"
BlockPoint _ h -> renderHeaderHash (Proxy @header) h)
]
toObject _verb BlockFetch.CompletedFetchBatch {} =
mkObject [ "kind" .= String "CompletedFetchBatch" ]
toObject _verb BlockFetch.StartedFetchBatch {} =
Expand Down
5 changes: 4 additions & 1 deletion cardano-node/src/Cardano/Tracing/Tracers.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -537,7 +537,10 @@ mkConsensusTracers mbEKGDirect trSel verb tr nodeKern fStats = do

pure Consensus.Tracers
{ Consensus.chainSyncClientTracer = tracerOnOff (traceChainSyncClient trSel) verb "ChainSyncClient" tr
, Consensus.chainSyncServerHeaderTracer = Tracer $ \ev -> traceServedCount mbEKGDirect ev
, Consensus.chainSyncServerHeaderTracer =
Tracer $ \ev -> do
traceWith (annotateSeverity . toLogObject' verb $ appendName "ChainSyncHeaderServer" tr) ev
traceServedCount mbEKGDirect ev
, Consensus.chainSyncServerBlockTracer = tracerOnOff (traceChainSyncBlockServer trSel) verb "ChainSyncBlockServer" tr
, Consensus.blockFetchDecisionTracer = tracerOnOff' (traceBlockFetchDecisions trSel) $
annotateSeverity $ teeTraceBlockFetchDecision verb elidedFetchDecision tr
Expand Down