Move Query Results to LedgerMetrics Periodical Tracer

bench/locli/locli.cabal

@@ -152,7 +152,7 @@ executable locli
   ghc-options:          -threaded
                         -Wall
                         -rtsopts
-                        "-with-rtsopts=-T -N7 -A2m -qb -H64m"
+                        "-with-rtsopts=-T -N7 -A2m -c -H64m"
 
   build-depends:        aeson
                       , cardano-prelude

bench/tx-generator/src/Cardano/Benchmarking/Tracer.hs

@@ -177,6 +177,7 @@ initialTraceConfig = TraceConfig {
     , tcPeerFrequency = Just 2000 -- Every 2 seconds
     , tcResourceFrequency = Just 1000 -- Every second
     , tcMetricsPrefix = Nothing
+    , tcLedgerMetricsFrequency = Nothing
     }
   where
     setMaxDetail :: Text -> ([Text], [ConfigOption])

cabal.project

@@ -14,7 +14,7 @@ repository cardano-haskell-packages
 -- you need to run if you change them
 index-state:
   , hackage.haskell.org 2024-10-10T00:52:24Z
-  , cardano-haskell-packages 2024-10-30T10:23:17Z
+  , cardano-haskell-packages 2025-01-02T21:54:55Z
 
 packages:
   cardano-node
@@ -68,3 +68,17 @@ allow-newer:
 -- IMPORTANT
 -- Do NOT add more source-repository-package stanzas here unless they are strictly
 -- temporary! Please read the section in CONTRIBUTING about updating dependencies.
+
+-- exposes getBlockchainTime in NodeKernel
+source-repository-package
+  type: git
+  location: https://github.com/mgmeier/ouroboros-consensus.git
+  tag: 509bf8eafcf8ec7e28a1abe587d8913ed8838404
+  --sha256: 1klx7x85bkzl83gmjpc2jhihjcvy3vcm75k5f0rxivgwxg4gh3k2
+  subdir:
+    ouroboros-consensus
+    ouroboros-consensus-cardano
+    ouroboros-consensus-diffusion
+    ouroboros-consensus-protocol
+    sop-extras
+    strict-sop-core

cardano-node/cardano-node.cabal

@@ -1,7 +1,7 @@
 cabal-version: 3.0
 
 name:                   cardano-node
-version:                10.1.2
+version:                10.1.4
 synopsis:               The cardano full node
 description:            The cardano full node.
 category:               Cardano,
@@ -111,6 +111,7 @@ library
                         Cardano.Node.Tracing.Tracers.Diffusion
                         Cardano.Node.Tracing.Tracers.ForgingThreadStats
                         Cardano.Node.Tracing.Tracers.KESInfo
+                        Cardano.Node.Tracing.Tracers.LedgerMetrics
                         Cardano.Node.Tracing.Tracers.NodeToClient
                         Cardano.Node.Tracing.Tracers.NodeToNode
                         Cardano.Node.Tracing.Tracers.NodeVersion
@@ -119,7 +120,6 @@ library
                         Cardano.Node.Tracing.Tracers.Peer
                         Cardano.Node.Tracing.Tracers.Resources
                         Cardano.Node.Tracing.Tracers.Shutdown
-                        Cardano.Node.Tracing.Tracers.StartLeadershipCheck
                         Cardano.Node.Tracing.Tracers.Startup
                         Cardano.Node.Types
                         Cardano.Tracing.Config
@@ -156,7 +156,7 @@ library
                       , cardano-ledger-binary
                       , cardano-ledger-byron
                       -- TODO: remove constraint at next ledger bump
-                      , cardano-ledger-conway ^>= 1.17.2
+                      , cardano-ledger-conway ^>= 1.17.4
                       , cardano-ledger-core
                       , cardano-ledger-shelley
                       , cardano-prelude

cardano-node/src/Cardano/Node/Protocol/Cardano.hs

@@ -171,7 +171,7 @@ mkSomeConsensusProtocolCardano NodeByronProtocolConfiguration {
                                             shelleyGenesisHash,
           shelleyBasedLeaderCredentials = shelleyLeaderCredentials
         }
-      , Consensus.cardanoProtocolVersion = ProtVer (natVersion @10) 0
+      , Consensus.cardanoProtocolVersion = ProtVer (natVersion @10) 2
         -- The remaining arguments specify the parameters needed to transition between two eras
       , Consensus.cardanoLedgerTransitionConfig =
           Ledger.mkLatestTransitionConfig

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

@@ -15,9 +15,9 @@ import           Cardano.Node.Startup (NodeInfo, NodeStartupInfo, StartupTrace (
 import           Cardano.Node.Tracing.StateRep (NodeState)
 import           Cardano.Node.Tracing.Tracers.ConsensusStartupException
                    (ConsensusStartupException (..))
-import           Cardano.Node.Tracing.Tracers.Peer (PeerT)
+import           Cardano.Node.Tracing.Tracers.LedgerMetrics (LedgerMetrics)
 import           Cardano.Node.Tracing.Tracers.NodeVersion (NodeVersionTrace)
-
+import           Cardano.Node.Tracing.Tracers.Peer (PeerT)
 import qualified Ouroboros.Consensus.Network.NodeToClient as NodeToClient
 import qualified Ouroboros.Consensus.Network.NodeToNode as NodeToNode
 import qualified Ouroboros.Consensus.Node.Tracers as Consensus
@@ -55,4 +55,5 @@ data Tracers peer localPeer blk p2p = Tracers
   , nodeStateTracer       :: !(Tracer IO NodeState)
   , resourcesTracer       :: !(Tracer IO ResourceStats)
   , peersTracer           :: !(Tracer IO [PeerT blk])
+  , ledgerMetricsTracer   :: !(Tracer IO LedgerMetrics)
   }

cardano-node/src/Cardano/Node/Tracing/API.hs

@@ -18,6 +18,7 @@ import           Cardano.Node.Tracing
 import           Cardano.Node.Tracing.DefaultTraceConfig (defaultCardanoConfig)
 import           Cardano.Node.Tracing.StateRep (NodeState (..))
 import           Cardano.Node.Tracing.Tracers
+import           Cardano.Node.Tracing.Tracers.LedgerMetrics
 import           Cardano.Node.Tracing.Tracers.Peer (startPeerTracer)
 import           Cardano.Node.Tracing.Tracers.Resources (startResourceTracer)
 import           Cardano.Node.Types
@@ -69,6 +70,11 @@ initTraceDispatcher nc p networkMagic nodeKernel p2pMode = do
     (resourcesTracer tracers)
     (fromMaybe 1000 (tcResourceFrequency trConfig))
 
+  startLedgerMetricsTracer
+    (ledgerMetricsTracer tracers)
+    (fromMaybe 1000 (tcLedgerMetricsFrequency trConfig))
+    nodeKernel
+
   startPeerTracer
     (peersTracer tracers)
     nodeKernel

cardano-node/src/Cardano/Node/Tracing/Consistency.hs

@@ -22,13 +22,12 @@ import           Cardano.Node.Tracing.Documentation (docTracersFirstPhase)
 import           Cardano.Node.Tracing.Formatting ()
 import qualified Cardano.Node.Tracing.StateRep as SR
 import           Cardano.Node.Tracing.Tracers.BlockReplayProgress
-import           Cardano.Node.Tracing.Tracers.Consensus
 import           Cardano.Node.Tracing.Tracers.Diffusion ()
 import           Cardano.Node.Tracing.Tracers.KESInfo ()
+import           Cardano.Node.Tracing.Tracers.LedgerMetrics (LedgerMetrics)
 import           Cardano.Node.Tracing.Tracers.NodeToClient ()
 import           Cardano.Node.Tracing.Tracers.NodeToNode ()
 import           Cardano.Node.Tracing.Tracers.NodeVersion (NodeVersionTrace)
-
 import           Cardano.Node.Tracing.Tracers.NonP2P ()
 import           Cardano.Node.Tracing.Tracers.P2P ()
 import           Cardano.Node.Tracing.Tracers.Peer
@@ -46,6 +45,7 @@ import           Ouroboros.Consensus.MiniProtocol.ChainSync.Client (TraceChainSy
 import           Ouroboros.Consensus.MiniProtocol.ChainSync.Server (TraceChainSyncServerEvent)
 import           Ouroboros.Consensus.MiniProtocol.LocalTxSubmission.Server
                    (TraceLocalTxSubmissionServerEvent (..))
+import           Ouroboros.Consensus.Node.Tracers (TraceForgeEvent)
 import qualified Ouroboros.Consensus.Protocol.Ledger.HotKey as HotKey
 import qualified Ouroboros.Consensus.Storage.ChainDB as ChainDB
 import           Ouroboros.Network.Block (Point (..), SlotNo, Tip)
@@ -128,6 +128,8 @@ getAllNamespaces =
                       (allNamespaces :: [Namespace [PeerT blk]])
         resourcesNS = map nsGetTuple
                           (allNamespaces :: [Namespace ResourceStats])
+        ledgerMetricsNS = map nsGetTuple
+                          (allNamespaces :: [Namespace LedgerMetrics])
         startupNS = map (nsGetTuple . nsReplacePrefix ["Startup"])
                         (allNamespaces :: [Namespace (StartupTrace blk)])
         shutdownNS = map (nsGetTuple . nsReplacePrefix ["Shutdown"])
@@ -180,7 +182,7 @@ getAllNamespaces =
         mempoolNS = map (nsGetTuple . nsReplacePrefix ["Mempool"])
                         (allNamespaces :: [Namespace (TraceEventMempool blk)])
         forgeNS = map (nsGetTuple . nsReplacePrefix ["Forge", "Loop"])
-                        (allNamespaces :: [Namespace (ForgeTracerType blk)])
+                         (allNamespaces :: [Namespace (TraceForgeEvent blk)])
 
         blockchainTimeNS = map (nsGetTuple . nsReplacePrefix  ["BlockchainTime"])
                         (allNamespaces :: [Namespace (TraceBlockchainTimeEvent RelativeTime)])
@@ -371,6 +373,7 @@ getAllNamespaces =
             stateNS
             <> peersNS
             <> resourcesNS
+            <> ledgerMetricsNS
             <> startupNS
             <> shutdownNS
             <> nodeVersionNS

cardano-node/src/Cardano/Node/Tracing/Documentation.hs

@@ -33,6 +33,7 @@ import           Cardano.Node.Tracing.Tracers.Consensus
 import           Cardano.Node.Tracing.Tracers.Diffusion ()
 import           Cardano.Node.Tracing.Tracers.ForgingThreadStats (ForgeThreadStats)
 import           Cardano.Node.Tracing.Tracers.KESInfo ()
+import           Cardano.Node.Tracing.Tracers.LedgerMetrics (LedgerMetrics)
 import           Cardano.Node.Tracing.Tracers.NodeToClient ()
 import           Cardano.Node.Tracing.Tracers.NodeToNode ()
 import           Cardano.Node.Tracing.Tracers.NodeVersion (NodeVersionTrace)
@@ -231,6 +232,10 @@ docTracersFirstPhase condConfigFileName = do
     configureTracers configReflection trConfig [resourcesTr]
     resourcesTrDoc <- documentTracer (resourcesTr :: Trace IO ResourceStats)
 
+    ledgerMetricsTr <- mkCardanoTracer trBase trForward mbTrEKG []
+    configureTracers configReflection trConfig [ledgerMetricsTr]
+    ledgerMetricsTrDoc <- documentTracer (ledgerMetricsTr :: Trace IO LedgerMetrics)
+
     -- Startup tracer
     startupTr <- mkCardanoTracer
                 trBase trForward mbTrEKG
@@ -360,8 +365,7 @@ docTracersFirstPhase condConfigFileName = do
                 ["Forge", "Loop"]
     configureTracers configReflection trConfig [forgeTr]
     forgeTrDoc <- documentTracer (forgeTr ::
-      Trace IO (ForgeTracerType blk))
-
+      Trace IO (Consensus.TraceForgeEvent blk))
 
     forgeTr' <-  mkCardanoTracer
                 trBase trForward mbTrEKG
@@ -377,6 +381,8 @@ docTracersFirstPhase condConfigFileName = do
     blockchainTimeTrDoc <- documentTracer (blockchainTimeTr ::
       Trace IO (TraceBlockchainTimeEvent RelativeTime))
 
+
+
 -- Node to client
 
     keepAliveClientTr <- mkCardanoTracer
@@ -699,6 +705,7 @@ docTracersFirstPhase condConfigFileName = do
             <> nodeStartupInfoDpDoc
             <> stateTrDoc
             <> resourcesTrDoc
+            <> ledgerMetricsTrDoc
             <> startupTrDoc
             <> shutdownTrDoc
             <> nodeVersionDoc

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

@@ -31,6 +31,7 @@ import           Cardano.Node.Tracing.Tracers.Consensus
 import           Cardano.Node.Tracing.Tracers.Diffusion ()
 import           Cardano.Node.Tracing.Tracers.ForgingThreadStats (forgeThreadStats)
 import           Cardano.Node.Tracing.Tracers.KESInfo
+import           Cardano.Node.Tracing.Tracers.LedgerMetrics ()
 import           Cardano.Node.Tracing.Tracers.NodeToClient ()
 import           Cardano.Node.Tracing.Tracers.NodeToNode ()
 import           Cardano.Node.Tracing.Tracers.NodeVersion (getNodeVersion)
@@ -117,6 +118,9 @@ mkDispatchTracers nodeKernel trBase trForward mbTrEKG trDataPoint trConfig enabl
     !resourcesTr <- mkCardanoTracer trBase trForward mbTrEKG []
     configureTracers configReflection trConfig [resourcesTr]
 
+    !ledgerMetricsTr <- mkCardanoTracer trBase trForward mbTrEKG []
+    configureTracers configReflection trConfig [ledgerMetricsTr]
+
     !startupTr <- mkCardanoTracer trBase trForward mbTrEKG ["Startup"]
     configureTracers configReflection trConfig [startupTr]
 
@@ -199,6 +203,7 @@ mkDispatchTracers nodeKernel trBase trForward mbTrEKG trDataPoint trConfig enabl
       , resourcesTracer = Tracer (traceWith resourcesTr)
       , peersTracer     = Tracer (traceWith peersTr)
                           <> Tracer (traceNodePeers nodePeersDP)
+      , ledgerMetricsTracer = Tracer (traceWith ledgerMetricsTr)
     }
 
 mkConsensusTracers :: forall blk.
@@ -217,7 +222,7 @@ mkConsensusTracers :: forall blk.
   -> TraceConfig
   -> NodeKernelData blk
   -> IO (Consensus.Tracers IO (ConnectionId RemoteAddress) (ConnectionId LocalAddress) blk)
-mkConsensusTracers configReflection trBase trForward mbTrEKG _trDataPoint trConfig nodeKernel = do
+mkConsensusTracers configReflection trBase trForward mbTrEKG _trDataPoint trConfig _nodeKernel = do
     !chainSyncClientTr  <- mkCardanoTracer
                 trBase trForward mbTrEKG
                  ["ChainSync", "Client"]
@@ -301,10 +306,9 @@ mkConsensusTracers configReflection trBase trForward mbTrEKG _trDataPoint trConf
                 ["Mempool"]
     configureTracers configReflection trConfig [mempoolTr]
 
-    !forgeTr    <- mkCardanoTracer'
+    !forgeTr    <- mkCardanoTracer
                 trBase trForward mbTrEKG
                 ["Forge", "Loop"]
-                (forgeTracerTransform nodeKernel)
     configureTracers configReflection trConfig [forgeTr]
 
     !forgeThreadStatsTr <- mkCardanoTracer'
@@ -363,9 +367,9 @@ mkConsensusTracers configReflection trBase trForward mbTrEKG _trDataPoint trConf
       , Consensus.mempoolTracer = Tracer $
           traceWith mempoolTr
       , Consensus.forgeTracer =
-           Tracer (\(Consensus.TraceLabelCreds _ x) -> traceWith (contramap Left forgeTr) x)
+           Tracer (\(Consensus.TraceLabelCreds _ x) -> traceWith forgeTr x)
            <>
-           Tracer (\(Consensus.TraceLabelCreds _ x) -> traceWith (contramap Left forgeThreadStatsTr) x)
+           Tracer (\(Consensus.TraceLabelCreds _ x) -> traceWith forgeThreadStatsTr x)
       , Consensus.blockchainTimeTracer = Tracer $
           traceWith blockchainTimeTr
       , Consensus.keepAliveClientTracer = Tracer $

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

@@ -11,6 +11,7 @@
 
 module Cardano.Node.Tracing.Tracers.ChainDB
    ( withAddedToCurrentChainEmptyLimited
+   , fragmentChainDensity
    ) where
 
 import           Cardano.Logging