Skip to content

Commit 54307e6

Browse files
committed
Update for new Consensus tracers
1 parent b8f5eac commit 54307e6

File tree

4 files changed

+228
-111
lines changed

4 files changed

+228
-111
lines changed

cardano-node/src/Cardano/Node/Tracing/Tracers/ChainDB.hs

Lines changed: 46 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ import qualified Ouroboros.Consensus.Storage.LedgerDB.Types as LedgerDB
4949
import qualified Ouroboros.Consensus.Storage.VolatileDB as VolDB
5050
import qualified Ouroboros.Consensus.Storage.VolatileDB.Impl as VolDb
5151
import Ouroboros.Consensus.Util.Condense (condense)
52+
import Ouroboros.Consensus.Util.Enclose
5253

5354
import qualified Data.Aeson.KeyMap as KeyMap
5455
import qualified Ouroboros.Network.AnchoredFragment as AF
@@ -203,9 +204,11 @@ sevTraceAddBlockEvent ChainDB.IgnoreInvalidBlock {} = Info
203204
sevTraceAddBlockEvent ChainDB.AddedBlockToQueue {} = Debug
204205
sevTraceAddBlockEvent ChainDB.BlockInTheFuture {} = Info
205206
sevTraceAddBlockEvent ChainDB.AddedBlockToVolatileDB {} = Debug
207+
sevTraceAddBlockEvent ChainDB.PoppedBlockFromQueue {} = Debug
206208
sevTraceAddBlockEvent ChainDB.TryAddToCurrentChain {} = Debug
207209
sevTraceAddBlockEvent ChainDB.TrySwitchToAFork {} = Info
208210
sevTraceAddBlockEvent ChainDB.StoreButDontChange {} = Debug
211+
sevTraceAddBlockEvent ChainDB.ChangingSelection {} = Debug
209212
sevTraceAddBlockEvent (ChainDB.AddedToCurrentChain events _ _ _) =
210213
maximumDef Notice (map sevLedgerEvent events)
211214
sevTraceAddBlockEvent (ChainDB.SwitchedToAFork events _ _ _) =
@@ -234,6 +237,8 @@ namesForChainDBAddBlock (ChainDB.IgnoreInvalidBlock {}) =
234237
["IgnoreInvalidBlock"]
235238
namesForChainDBAddBlock (ChainDB.AddedBlockToQueue {}) =
236239
["AddedBlockToQueue"]
240+
namesForChainDBAddBlock (ChainDB.PoppedBlockFromQueue {}) =
241+
["PoppedBlockFromQueue"]
237242
namesForChainDBAddBlock (ChainDB.BlockInTheFuture {}) =
238243
["BlockInTheFuture"]
239244
namesForChainDBAddBlock (ChainDB.AddedBlockToVolatileDB {}) =
@@ -248,6 +253,8 @@ namesForChainDBAddBlock (ChainDB.AddedToCurrentChain {}) =
248253
["AddedToCurrentChain"]
249254
namesForChainDBAddBlock (ChainDB.SwitchedToAFork {}) =
250255
["SwitchedToAFork"]
256+
namesForChainDBAddBlock (ChainDB.ChangingSelection {}) =
257+
["ChangingSelection"]
251258
namesForChainDBAddBlock (ChainDB.AddBlockValidation ev') =
252259
"AddBlockValidation" : namesForChainDBAddBlockValidation ev'
253260
namesForChainDBAddBlock (ChainDB.ChainSelectionForFutureBlock {}) =
@@ -285,8 +292,18 @@ instance ( LogFormatting (Header blk)
285292
"Ignoring block already in DB: " <> renderRealPointAsPhrase pt
286293
forHuman (ChainDB.IgnoreInvalidBlock pt _reason) =
287294
"Ignoring previously seen invalid block: " <> renderRealPointAsPhrase pt
288-
forHuman (ChainDB.AddedBlockToQueue pt sz) =
289-
"Block added to queue: " <> renderRealPointAsPhrase pt <> " queue size " <> condenseT sz
295+
forHuman (ChainDB.AddedBlockToQueue pt edgeSz) =
296+
case edgeSz of
297+
RisingEdge ->
298+
"About to add block to queue: " <> renderRealPointAsPhrase pt
299+
FallingEdgeWith sz ->
300+
"Block added to queue: " <> renderRealPointAsPhrase pt <> " queue size " <> condenseT sz
301+
forHuman (ChainDB.PoppedBlockFromQueue edgePt) =
302+
case edgePt of
303+
RisingEdge ->
304+
"Popping block from queue"
305+
FallingEdgeWith pt ->
306+
"Popped block from queue: " <> renderRealPointAsPhrase pt
290307
forHuman (ChainDB.BlockInTheFuture pt slot) =
291308
"Ignoring block from future: " <> renderRealPointAsPhrase pt <> ", slot " <> condenseT slot
292309
forHuman (ChainDB.StoreButDontChange pt) =
@@ -295,15 +312,19 @@ instance ( LogFormatting (Header blk)
295312
"Block fits onto the current chain: " <> renderRealPointAsPhrase pt
296313
forHuman (ChainDB.TrySwitchToAFork pt _) =
297314
"Block fits onto some fork: " <> renderRealPointAsPhrase pt
315+
forHuman (ChainDB.ChangingSelection pt) =
316+
"Changing selection to: " <> renderPointAsPhrase pt
298317
forHuman (ChainDB.AddedToCurrentChain es _ _ c) =
299318
"Chain extended, new tip: " <> renderPointAsPhrase (AF.headPoint c) <>
300319
Text.concat [ "\nEvent: " <> showT e | e <- es ]
301320
forHuman (ChainDB.SwitchedToAFork es _ _ c) =
302321
"Switched to a fork, new tip: " <> renderPointAsPhrase (AF.headPoint c) <>
303322
Text.concat [ "\nEvent: " <> showT e | e <- es ]
304323
forHuman (ChainDB.AddBlockValidation ev') = forHuman ev'
305-
forHuman (ChainDB.AddedBlockToVolatileDB pt _ _) =
306-
"Chain added block " <> renderRealPointAsPhrase pt
324+
forHuman (ChainDB.AddedBlockToVolatileDB pt _ _ enclosing) =
325+
case enclosing of
326+
RisingEdge -> "Chain about to add block " <> renderRealPointAsPhrase pt
327+
FallingEdgeWith () -> "Chain added block " <> renderRealPointAsPhrase pt
307328
forHuman (ChainDB.ChainSelectionForFutureBlock pt) =
308329
"Chain selection run for block previously from future: " <> renderRealPointAsPhrase pt
309330
forHuman (ChainDB.PipeliningEvent ev') = forHuman ev'
@@ -317,10 +338,13 @@ instance ( LogFormatting (Header blk)
317338
mconcat [ "kind" .= String "IgnoreInvalidBlock"
318339
, "block" .= forMachine dtal pt
319340
, "reason" .= showT reason ]
320-
forMachine dtal (ChainDB.AddedBlockToQueue pt sz) =
341+
forMachine dtal (ChainDB.AddedBlockToQueue pt edgeSz) =
321342
mconcat [ "kind" .= String "AddedBlockToQueue"
322343
, "block" .= forMachine dtal pt
323-
, "queueSize" .= toJSON sz ]
344+
, case edgeSz of RisingEdge -> "risingEdge" .= True; FallingEdgeWith sz -> "queueSize" .= toJSON sz ]
345+
forMachine dtal (ChainDB.PoppedBlockFromQueue edgePt) =
346+
mconcat [ "kind" .= String "TraceAddBlockEvent.PoppedBlockFromQueue"
347+
, case edgePt of RisingEdge -> "risingEdge" .= True; FallingEdgeWith pt -> "block" .= forMachine dtal pt ]
324348
forMachine dtal (ChainDB.BlockInTheFuture pt slot) =
325349
mconcat [ "kind" .= String "BlockInTheFuture"
326350
, "block" .= forMachine dtal pt
@@ -334,6 +358,9 @@ instance ( LogFormatting (Header blk)
334358
forMachine dtal (ChainDB.TrySwitchToAFork pt _) =
335359
mconcat [ "kind" .= String "TraceAddBlockEvent.TrySwitchToAFork"
336360
, "block" .= forMachine dtal pt ]
361+
forMachine dtal (ChainDB.ChangingSelection pt) =
362+
mconcat [ "kind" .= String "TraceAddBlockEvent.ChangingSelection"
363+
, "block" .= forMachine dtal pt ]
337364
forMachine dtal (ChainDB.AddedToCurrentChain events _ base extended) =
338365
mconcat $
339366
[ "kind" .= String "AddedToCurrentChain"
@@ -354,10 +381,11 @@ instance ( LogFormatting (Header blk)
354381
| not (null events) ]
355382
forMachine dtal (ChainDB.AddBlockValidation ev') =
356383
kindContext "AddBlockEvent" $ forMachine dtal ev'
357-
forMachine dtal (ChainDB.AddedBlockToVolatileDB pt (BlockNo bn) _) =
358-
mconcat [ "kind" .= String "AddedBlockToVolatileDB"
359-
, "block" .= forMachine dtal pt
360-
, "blockNo" .= showT bn ]
384+
forMachine dtal (ChainDB.AddedBlockToVolatileDB pt (BlockNo bn) _ enclosing) =
385+
mconcat $ [ "kind" .= String "AddedBlockToVolatileDB"
386+
, "block" .= forMachine dtal pt
387+
, "blockNo" .= showT bn ]
388+
<> [ "risingEdge" .= True | RisingEdge <- [enclosing] ]
361389
forMachine dtal (ChainDB.ChainSelectionForFutureBlock pt) =
362390
mconcat [ "kind" .= String "TChainSelectionForFutureBlock"
363391
, "block" .= forMachine dtal pt ]
@@ -387,16 +415,19 @@ instance ( LogFormatting (Header blk)
387415
instance ( ConvertRawHash (Header blk)
388416
, HasHeader (Header blk)
389417
) => LogFormatting (ChainDB.TracePipeliningEvent blk) where
390-
forHuman (ChainDB.SetTentativeHeader hdr) =
391-
"Set tentative header to " <> renderPointAsPhrase (blockPoint hdr)
418+
forHuman (ChainDB.SetTentativeHeader hdr enclosing) =
419+
case enclosing of
420+
RisingEdge -> "About to set tentative header to " <> renderPointAsPhrase (blockPoint hdr)
421+
FallingEdgeWith () -> "Set tentative header to " <> renderPointAsPhrase (blockPoint hdr)
392422
forHuman (ChainDB.TrapTentativeHeader hdr) =
393423
"Discovered trap tentative header " <> renderPointAsPhrase (blockPoint hdr)
394424
forHuman (ChainDB.OutdatedTentativeHeader hdr) =
395425
"Tentative header is now outdated " <> renderPointAsPhrase (blockPoint hdr)
396426

397-
forMachine dtals (ChainDB.SetTentativeHeader hdr) =
398-
mconcat [ "kind" .= String "SetTentativeHeader"
399-
, "block" .= renderPointForDetails dtals (blockPoint hdr) ]
427+
forMachine dtals (ChainDB.SetTentativeHeader hdr enclosing) =
428+
mconcat $ [ "kind" .= String "SetTentativeHeader"
429+
, "block" .= renderPointForDetails dtals (blockPoint hdr) ]
430+
<> [ "risingEdge" .= True | RisingEdge <- [enclosing] ]
400431
forMachine dtals (ChainDB.TrapTentativeHeader hdr) =
401432
mconcat [ "kind" .= String "TrapTentativeHeader"
402433
, "block" .= renderPointForDetails dtals (blockPoint hdr) ]

cardano-node/src/Cardano/Node/Tracing/Tracers/Consensus.hs

Lines changed: 86 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ import Ouroboros.Consensus.MiniProtocol.LocalTxSubmission.Server
111111
import Ouroboros.Consensus.Node.Run (SerialiseNodeToNodeConstraints, estimateBlockSize)
112112
import Ouroboros.Consensus.Node.Tracers
113113
import qualified Ouroboros.Consensus.Protocol.Ledger.HotKey as HotKey
114+
import Ouroboros.Consensus.Util.Enclose
114115

115116

116117

@@ -249,58 +250,50 @@ docChainSyncClientEvent' = Documented [
249250
--------------------------------------------------------------------------------
250251

251252
severityChainSyncServerEvent :: TraceChainSyncServerEvent blk -> SeverityS
252-
severityChainSyncServerEvent TraceChainSyncServerRead {} = Info
253-
severityChainSyncServerEvent TraceChainSyncServerReadBlocked {} = Info
254-
severityChainSyncServerEvent TraceChainSyncRollForward {} = Info
255-
severityChainSyncServerEvent TraceChainSyncRollBackward {} = Info
253+
severityChainSyncServerEvent (TraceChainSyncServerUpdate _tip _upd _blocking enclosing) =
254+
case enclosing of
255+
RisingEdge -> Info
256+
FallingEdgeWith () -> Debug
256257

257258
namesForChainSyncServerEvent :: TraceChainSyncServerEvent blk -> [Text]
258259
namesForChainSyncServerEvent ev =
259260
"ChainSyncServerEvent" : namesForChainSyncServerEvent' ev
260261

261262

262263
namesForChainSyncServerEvent' :: TraceChainSyncServerEvent blk -> [Text]
263-
namesForChainSyncServerEvent' TraceChainSyncServerRead {} =
264+
namesForChainSyncServerEvent' (TraceChainSyncServerUpdate _tip _update NonBlocking _enclosing) =
264265
["ServerRead"]
265-
namesForChainSyncServerEvent' TraceChainSyncServerReadBlocked {} =
266+
namesForChainSyncServerEvent' (TraceChainSyncServerUpdate _tip _update Blocking _enclosing) =
266267
["ServerReadBlocked"]
267-
namesForChainSyncServerEvent' TraceChainSyncRollForward {} =
268-
["RollForward"]
269-
namesForChainSyncServerEvent' TraceChainSyncRollBackward {} =
270-
["RollBackward"]
271268

272269
instance ConvertRawHash blk
273270
=> LogFormatting (TraceChainSyncServerEvent blk) where
274-
forMachine _dtal (TraceChainSyncServerRead tip (AddBlock _hdr)) =
275-
mconcat
271+
forMachine _dtal (TraceChainSyncServerUpdate tip (AddBlock _hdr) NonBlocking enclosing) =
272+
mconcat $
276273
[ "kind" .= String "ChainSyncServerRead.AddBlock"
277274
, tipToObject tip
278275
]
279-
forMachine _dtal (TraceChainSyncServerRead tip (RollBack _pt)) =
280-
mconcat
276+
<> [ "risingEdge" .= True | RisingEdge <- [enclosing] ]
277+
forMachine _dtal (TraceChainSyncServerUpdate tip (RollBack _pt) NonBlocking enclosing) =
278+
mconcat $
281279
[ "kind" .= String "ChainSyncServerRead.RollBack"
282280
, tipToObject tip
283281
]
284-
forMachine _dtal (TraceChainSyncServerReadBlocked tip (AddBlock _hdr)) =
285-
mconcat
282+
<> [ "risingEdge" .= True | RisingEdge <- [enclosing] ]
283+
forMachine _dtal (TraceChainSyncServerUpdate tip (AddBlock _pt) Blocking enclosing) =
284+
mconcat $
286285
[ "kind" .= String "ChainSyncServerReadBlocked.AddBlock"
287286
, tipToObject tip
288287
]
289-
forMachine _dtal (TraceChainSyncServerReadBlocked tip (RollBack _pt)) =
290-
mconcat
288+
<> [ "risingEdge" .= True | RisingEdge <- [enclosing] ]
289+
forMachine _dtal (TraceChainSyncServerUpdate tip (RollBack _pt) Blocking enclosing) =
290+
mconcat $
291291
[ "kind" .= String "ChainSyncServerReadBlocked.RollBack"
292292
, tipToObject tip
293293
]
294-
forMachine dtal (TraceChainSyncRollForward point) =
295-
mconcat [ "kind" .= String "ChainSyncServerRead.RollForward"
296-
, "point" .= forMachine dtal point
297-
]
298-
forMachine dtal (TraceChainSyncRollBackward point) =
299-
mconcat [ "kind" .= String "ChainSyncServerRead.ChainSyncRollBackward"
300-
, "point" .= forMachine dtal point
301-
]
294+
<> [ "risingEdge" .= True | RisingEdge <- [enclosing] ]
302295

303-
asMetrics (TraceChainSyncRollForward _point) =
296+
asMetrics (TraceChainSyncServerUpdate _tip (AddBlock _hdr) _blocking FallingEdge) =
304297
[CounterM "cardano.node.chainSync.rollForward" Nothing]
305298
asMetrics _ = []
306299

@@ -912,22 +905,24 @@ severityForge' :: TraceLabelCreds (TraceForgeEvent blk) -> SeverityS
912905
severityForge' (TraceLabelCreds _t e) = severityForge'' e
913906

914907
severityForge'' :: TraceForgeEvent blk -> SeverityS
915-
severityForge'' TraceStartLeadershipCheck {} = Info
916-
severityForge'' TraceSlotIsImmutable {} = Error
917-
severityForge'' TraceBlockFromFuture {} = Error
918-
severityForge'' TraceBlockContext {} = Debug
919-
severityForge'' TraceNoLedgerState {} = Error
920-
severityForge'' TraceLedgerState {} = Debug
921-
severityForge'' TraceNoLedgerView {} = Error
922-
severityForge'' TraceLedgerView {} = Debug
923-
severityForge'' TraceForgeStateUpdateError {} = Error
924-
severityForge'' TraceNodeCannotForge {} = Error
925-
severityForge'' TraceNodeNotLeader {} = Info
926-
severityForge'' TraceNodeIsLeader {} = Info
927-
severityForge'' TraceForgedBlock {} = Info
928-
severityForge'' TraceDidntAdoptBlock {} = Error
929-
severityForge'' TraceForgedInvalidBlock {} = Error
930-
severityForge'' TraceAdoptedBlock {} = Info
908+
severityForge'' TraceStartLeadershipCheck {} = Info
909+
severityForge'' TraceSlotIsImmutable {} = Error
910+
severityForge'' TraceBlockFromFuture {} = Error
911+
severityForge'' TraceBlockContext {} = Debug
912+
severityForge'' TraceNoLedgerState {} = Error
913+
severityForge'' TraceLedgerState {} = Debug
914+
severityForge'' TraceNoLedgerView {} = Error
915+
severityForge'' TraceLedgerView {} = Debug
916+
severityForge'' TraceForgeStateUpdateError {} = Error
917+
severityForge'' TraceNodeCannotForge {} = Error
918+
severityForge'' TraceNodeNotLeader {} = Info
919+
severityForge'' TraceNodeIsLeader {} = Info
920+
severityForge'' TraceForgeTickedLedgerState {} = Debug
921+
severityForge'' TraceForgingMempoolSnapshot {} = Debug
922+
severityForge'' TraceForgedBlock {} = Info
923+
severityForge'' TraceDidntAdoptBlock {} = Error
924+
severityForge'' TraceForgedInvalidBlock {} = Error
925+
severityForge'' TraceAdoptedBlock {} = Info
931926

932927
severityForge''' :: TraceLabelCreds TraceStartLeadershipCheckPlus -> SeverityS
933928
severityForge''' _ = Info
@@ -940,22 +935,24 @@ namesForForge' :: TraceLabelCreds (TraceForgeEvent blk) -> [Text]
940935
namesForForge' (TraceLabelCreds _t e) = namesForForge'' e
941936

942937
namesForForge'' :: TraceForgeEvent blk -> [Text]
943-
namesForForge'' TraceStartLeadershipCheck {} = ["StartLeadershipCheck"]
944-
namesForForge'' TraceSlotIsImmutable {} = ["SlotIsImmutable"]
945-
namesForForge'' TraceBlockFromFuture {} = ["BlockFromFuture"]
946-
namesForForge'' TraceBlockContext {} = ["BlockContext"]
947-
namesForForge'' TraceNoLedgerState {} = ["NoLedgerState"]
948-
namesForForge'' TraceLedgerState {} = ["LedgerState"]
949-
namesForForge'' TraceNoLedgerView {} = ["NoLedgerView"]
950-
namesForForge'' TraceLedgerView {} = ["LedgerView"]
951-
namesForForge'' TraceForgeStateUpdateError {} = ["ForgeStateUpdateError"]
952-
namesForForge'' TraceNodeCannotForge {} = ["NodeCannotForge"]
953-
namesForForge'' TraceNodeNotLeader {} = ["NodeNotLeader"]
954-
namesForForge'' TraceNodeIsLeader {} = ["NodeIsLeader"]
955-
namesForForge'' TraceForgedBlock {} = ["ForgedBlock"]
956-
namesForForge'' TraceDidntAdoptBlock {} = ["DidntAdoptBlock"]
957-
namesForForge'' TraceForgedInvalidBlock {} = ["ForgedInvalidBlock"]
958-
namesForForge'' TraceAdoptedBlock {} = ["AdoptedBlock"]
938+
namesForForge'' TraceStartLeadershipCheck {} = ["StartLeadershipCheck"]
939+
namesForForge'' TraceSlotIsImmutable {} = ["SlotIsImmutable"]
940+
namesForForge'' TraceBlockFromFuture {} = ["BlockFromFuture"]
941+
namesForForge'' TraceBlockContext {} = ["BlockContext"]
942+
namesForForge'' TraceNoLedgerState {} = ["NoLedgerState"]
943+
namesForForge'' TraceLedgerState {} = ["LedgerState"]
944+
namesForForge'' TraceNoLedgerView {} = ["NoLedgerView"]
945+
namesForForge'' TraceLedgerView {} = ["LedgerView"]
946+
namesForForge'' TraceForgeStateUpdateError {} = ["ForgeStateUpdateError"]
947+
namesForForge'' TraceNodeCannotForge {} = ["NodeCannotForge"]
948+
namesForForge'' TraceNodeNotLeader {} = ["NodeNotLeader"]
949+
namesForForge'' TraceNodeIsLeader {} = ["NodeIsLeader"]
950+
namesForForge'' TraceForgeTickedLedgerState {} = ["ForgeTickedLedgerState"]
951+
namesForForge'' TraceForgingMempoolSnapshot {} = ["ForgingMempoolSnapshot"]
952+
namesForForge'' TraceForgedBlock {} = ["ForgedBlock"]
953+
namesForForge'' TraceDidntAdoptBlock {} = ["DidntAdoptBlock"]
954+
namesForForge'' TraceForgedInvalidBlock {} = ["ForgedInvalidBlock"]
955+
namesForForge'' TraceAdoptedBlock {} = ["AdoptedBlock"]
959956

960957
namesForForge''' :: TraceLabelCreds TraceStartLeadershipCheckPlus -> [Text]
961958
namesForForge''' (TraceLabelCreds _ TraceStartLeadershipCheckPlus {}) =
@@ -1045,6 +1042,20 @@ instance ( tx ~ GenTx blk
10451042
[ "kind" .= String "TraceNodeIsLeader"
10461043
, "slot" .= toJSON (unSlotNo slotNo)
10471044
]
1045+
forMachine dtal (TraceForgeTickedLedgerState slotNo prevPt) =
1046+
mconcat
1047+
[ "kind" .= String "TraceForgeTickedLedgerState"
1048+
, "slot" .= toJSON (unSlotNo slotNo)
1049+
, "prev" .= renderPointForDetails dtal prevPt
1050+
]
1051+
forMachine dtal (TraceForgingMempoolSnapshot slotNo prevPt mpHash mpSlot) =
1052+
mconcat
1053+
[ "kind" .= String "TraceForgingMempoolSnapshot"
1054+
, "slot" .= toJSON (unSlotNo slotNo)
1055+
, "prev" .= renderPointForDetails dtal prevPt
1056+
, "mempoolHash" .= String (renderChainHash @blk (renderHeaderHash (Proxy @blk)) mpHash)
1057+
, "mempoolSlot" .= toJSON (unSlotNo mpSlot)
1058+
]
10481059
forMachine _dtal (TraceForgedBlock slotNo _ blk _) =
10491060
mconcat
10501061
[ "kind" .= String "TraceForgedBlock"
@@ -1133,6 +1144,20 @@ instance ( tx ~ GenTx blk
11331144
"Not leading slot " <> showT (unSlotNo slotNo)
11341145
forHuman (TraceNodeIsLeader slotNo) =
11351146
"Leading slot " <> showT (unSlotNo slotNo)
1147+
forHuman (TraceForgeTickedLedgerState slotNo prevPt) =
1148+
"While forging in slot "
1149+
<> showT (unSlotNo slotNo)
1150+
<> " we ticked the ledger state ahead from "
1151+
<> renderPointAsPhrase prevPt
1152+
forHuman (TraceForgingMempoolSnapshot slotNo prevPt mpHash mpSlot) =
1153+
"While forging in slot "
1154+
<> showT (unSlotNo slotNo)
1155+
<> " we acquired a mempool snapshot valid against "
1156+
<> renderPointAsPhrase prevPt
1157+
<> " from a mempool that was prepared for "
1158+
<> renderChainHash @blk (renderHeaderHash (Proxy @blk)) mpHash
1159+
<> " ticked to slot "
1160+
<> showT (unSlotNo mpSlot)
11361161
forHuman (TraceForgedBlock slotNo _ _ _) =
11371162
"Forged block in slot " <> showT (unSlotNo slotNo)
11381163
forHuman (TraceDidntAdoptBlock slotNo _) =
@@ -1189,6 +1214,8 @@ instance ( tx ~ GenTx blk
11891214
[IntM "cardano.node.nodeNotLeader" (fromIntegral $ unSlotNo slot)]
11901215
asMetrics (TraceNodeIsLeader slot) =
11911216
[IntM "cardano.node.nodeIsLeader" (fromIntegral $ unSlotNo slot)]
1217+
asMetrics TraceForgeTickedLedgerState {} = []
1218+
asMetrics TraceForgingMempoolSnapshot {} = []
11921219
asMetrics (TraceForgedBlock slot _ _ _) =
11931220
[IntM "cardano.node.forgedSlotLast" (fromIntegral $ unSlotNo slot)]
11941221
asMetrics (TraceDidntAdoptBlock slot _) =

0 commit comments

Comments
 (0)