From e5ea4016e849c283fad4e6b3c1f75236d2f31fb4 Mon Sep 17 00:00:00 2001 From: Javier Sagredo Date: Mon, 15 Dec 2025 11:53:24 +0100 Subject: [PATCH 1/2] Include tracer forcing in Consensus --- cabal.project | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cabal.project b/cabal.project index d35b151dd2b..a8c8c9fb885 100644 --- a/cabal.project +++ b/cabal.project @@ -87,8 +87,8 @@ source-repository-package source-repository-package type: git location: https://github.com/IntersectMBO/ouroboros-consensus - tag: 22773e62030913fe6cd974563b9bfe847f1ab493 - --sha256: sha256-wyteLIlavsR785ylIWDrAtUK6erneZmDtaPmu5FxSHg= + tag: 8e3b611cd33dfc6b432e01f9c638358a39b9d1c5 + --sha256: sha256-ET4bu3xlYI6lxL7YZdGKOzdet2F6+som1BxsO76cHnY= subdir: ouroboros-consensus ouroboros-consensus-cardano From 3640cf6fbd301e3771a3dc34d802660dcd3a6018 Mon Sep 17 00:00:00 2001 From: Javier Sagredo Date: Tue, 16 Dec 2025 14:10:34 +0100 Subject: [PATCH 2/2] Resurrect UTxO size metric --- cabal.project | 4 ++-- .../src/Cardano/Node/Tracing/Tracers/LedgerMetrics.hs | 2 +- cardano-node/src/Cardano/Tracing/Tracers.hs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cabal.project b/cabal.project index a8c8c9fb885..67eff170a44 100644 --- a/cabal.project +++ b/cabal.project @@ -87,8 +87,8 @@ source-repository-package source-repository-package type: git location: https://github.com/IntersectMBO/ouroboros-consensus - tag: 8e3b611cd33dfc6b432e01f9c638358a39b9d1c5 - --sha256: sha256-ET4bu3xlYI6lxL7YZdGKOzdet2F6+som1BxsO76cHnY= + tag: 8a8e8d27557eee2cbd3213f4d3f2a46569a0787e + --sha256: sha256-pQ+5S12CbK7OM9NiLOvdJKeQHrpGDEaSd4YOSaEfZ00= subdir: ouroboros-consensus ouroboros-consensus-cardano diff --git a/cardano-node/src/Cardano/Node/Tracing/Tracers/LedgerMetrics.hs b/cardano-node/src/Cardano/Node/Tracing/Tracers/LedgerMetrics.hs index dc97441f6fc..ed19866e724 100644 --- a/cardano-node/src/Cardano/Node/Tracing/Tracers/LedgerMetrics.hs +++ b/cardano-node/src/Cardano/Node/Tracing/Tracers/LedgerMetrics.hs @@ -105,7 +105,7 @@ traceLedgerMetrics nodeKern slotNo tracer = do query <- mapNodeKernelDataIO (\nk -> (,,) -- (,,,,) - <$> fmap (maybe 0 LedgerDB.ledgerTableSize) (ChainDB.getStatistics $ getChainDB nk) + <$> fmap LedgerDB.ledgerTableSize (ChainDB.getStatistics $ getChainDB nk) <*> nkQueryLedger (ledgerDelegMapSize . ledgerState) nk <*> nkQueryChain fragmentChainDensity nk {- see Note [GovMetrics] diff --git a/cardano-node/src/Cardano/Tracing/Tracers.hs b/cardano-node/src/Cardano/Tracing/Tracers.hs index a7e211c0925..cb6cd60e19a 100644 --- a/cardano-node/src/Cardano/Tracing/Tracers.hs +++ b/cardano-node/src/Cardano/Tracing/Tracers.hs @@ -1041,7 +1041,7 @@ traceLeadershipChecks _ft nodeKern _tverb tr = Tracer $ !query <- mapNodeKernelDataIO (\nk -> (,,) - <$> fmap (maybe 0 LedgerDB.ledgerTableSize) (ChainDB.getStatistics $ getChainDB nk) + <$> fmap LedgerDB.ledgerTableSize (ChainDB.getStatistics $ getChainDB nk) <*> nkQueryLedger (ledgerDelegMapSize . ledgerState) nk <*> nkQueryChain fragmentChainDensity nk) nodeKern