Update for new Consensus tracers

IntersectMBO · May 20, 2022 · 6036e3c · 6036e3c
1 parent 4e2aab8
commit 6036e3c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/cardano-node/src/Cardano/Node/Tracing/Tracers/Consensus.hs b/cardano-node/src/Cardano/Node/Tracing/Tracers/Consensus.hs
@@ -1113,8 +1113,8 @@ severityForge'' TraceDidntAdoptBlock {}         = Error
 severityForge'' TraceForgedInvalidBlock {}      = Error
 severityForge'' TraceAdoptedBlock {}            = Info
 
-severityForge'''' :: TraceStartLeadershipCheckPlus -> SeverityS
-severityForge'''' _ = Info
+severityForge''' :: TraceLabelCreds TraceStartLeadershipCheckPlus -> SeverityS
+severityForge''' _ = Info
 
 namesForForge :: ForgeTracerType blk -> [Text]
 namesForForge (Left t)  = namesForForge'' t
@@ -1140,8 +1140,10 @@ namesForForge'' TraceDidntAdoptBlock {}        = ["DidntAdoptBlock"]
 namesForForge'' TraceForgedInvalidBlock {}     = ["ForgedInvalidBlock"]
 namesForForge'' TraceAdoptedBlock {}           = ["AdoptedBlock"]
 
-namesForForge'''' :: TraceStartLeadershipCheckPlus -> [Text]
-namesForForge'''' TraceStartLeadershipCheckPlus{} = ["StartLeadershipCheckPlus"]
+namesForForge''' :: TraceLabelCreds TraceStartLeadershipCheckPlus -> [Text]
+namesForForge''' (TraceLabelCreds _ TraceStartLeadershipCheckPlus {})  =
+  ["StartLeadershipCheckPlus"]
+
 
 instance ( tx ~ GenTx blk
          , ConvertRawHash blk

diff --git a/cardano-node/src/Cardano/Tracing/Tracers.hs b/cardano-node/src/Cardano/Tracing/Tracers.hs
@@ -79,8 +79,8 @@ import qualified Ouroboros.Consensus.Protocol.Ledger.HotKey as HotKey
 import           Ouroboros.Consensus.Util.Enclose
 
 import qualified Ouroboros.Network.AnchoredFragment as AF
-import           Ouroboros.Network.Block (BlockNo (..), HasHeader (..), Point, StandardHash,
-                   blockNo, pointSlot, unBlockNo)
+import           Ouroboros.Network.Block (BlockNo (..), ChainUpdate (..),
+                   HasHeader (..), Point, StandardHash, blockNo, pointSlot, unBlockNo)
 import           Ouroboros.Network.BlockFetch.ClientState (TraceFetchClientState (..),
                    TraceLabelPeer (..))
 import           Ouroboros.Network.BlockFetch.Decision (FetchDecision, FetchDecline (..))
@@ -984,6 +984,8 @@ teeForge ft tverb tr = Tracer $
       Consensus.TraceNodeCannotForge {} -> teeForge' (ftTraceNodeCannotForge ft)
       Consensus.TraceNodeNotLeader{} -> teeForge' (ftTraceNodeNotLeader ft)
       Consensus.TraceNodeIsLeader{} -> teeForge' (ftTraceNodeIsLeader ft)
+      Consensus.TraceForgeTickedLedgerState{} -> nullTracer
+      Consensus.TraceForgingMempoolSnapshot{} -> nullTracer
       Consensus.TraceForgedBlock{} -> teeForge' (ftForged ft)
       Consensus.TraceDidntAdoptBlock{} -> teeForge' (ftDidntAdoptBlock ft)
       Consensus.TraceForgedInvalidBlock{} -> teeForge' (ftForgedInvalid ft)
@@ -1026,6 +1028,10 @@ teeForge' tr =
           LogValue "nodeNotLeader" $ PureI $ fromIntegral $ unSlotNo slot
         Consensus.TraceNodeIsLeader slot ->
           LogValue "nodeIsLeader" $ PureI $ fromIntegral $ unSlotNo slot
+        Consensus.TraceForgeTickedLedgerState slot _prevPt ->
+          LogValue "forgeTickedLedgerState" $ PureI $ fromIntegral $ unSlotNo slot
+        Consensus.TraceForgingMempoolSnapshot slot _prevPt _mpHash _mpSlotNo ->
+          LogValue "forgingMempoolSnapshot" $ PureI $ fromIntegral $ unSlotNo slot
         Consensus.TraceForgedBlock slot _ _ _ ->
           LogValue "forgedSlotLast" $ PureI $ fromIntegral $ unSlotNo slot
         Consensus.TraceDidntAdoptBlock slot _ ->