cardano-node: fixes

IntersectMBO · Nov 7, 2024 · d833fa1 · d833fa1
1 parent 4e0cabe
commit d833fa1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 17 deletions.
diff --git a/cardano-node/src/Cardano/Node/Tracing/Documentation.hs b/cardano-node/src/Cardano/Node/Tracing/Documentation.hs
@@ -102,7 +102,6 @@ import           Data.Proxy (Proxy (..))
 import qualified Data.Text.IO as T
 import           GHC.Generics (Generic)
 import           Network.Mux (MuxTrace (..), WithMuxBearer (..))
-import           Network.Mux.Trace (TraceLabelPeer (..))
 import qualified Network.Socket as Socket
 import qualified Options.Applicative as Opt
 import           System.IO
@@ -317,10 +316,6 @@ docTracersFirstPhase condConfigFileName = do
     blockFetchServerTrDoc <- documentTracer (blockFetchServerTr ::
       Trace IO (TraceBlockFetchServerEvent blk))
 
-    servedBlockLatestTr <- servedBlockLatest mbTrEKG
-    servedBlockLatestTrDoc <- documentTracer (servedBlockLatestTr ::
-      Trace IO (TraceLabelPeer peer (TraceBlockFetchServerEvent blk)))
-
     forgeKESInfoTr  <- mkCardanoTracer
                 trBase trForward mbTrEKG
                 ["Forge"]
@@ -718,7 +713,6 @@ docTracersFirstPhase condConfigFileName = do
             <> blockFetchClientTrDoc
             <> blockFetchClientMetricsDoc
             <> blockFetchServerTrDoc
-            <> servedBlockLatestTrDoc
             <> forgeKESInfoTrDoc
             <> txInboundTrDoc
             <> txOutboundTrDoc

diff --git a/cardano-node/src/Cardano/Node/Tracing/Tracers/Consensus.hs b/cardano-node/src/Cardano/Node/Tracing/Tracers/Consensus.hs
@@ -556,7 +556,7 @@ instance LogFormatting ClientMetrics where
 
 instance MetaTrace ClientMetrics where
   namespaceFor _ = Namespace [] ["ClientMetrics"]
-  severityFor _ _ = Nothing
+  severityFor _ _ = Just Debug
   documentFor _ = Just ""
 
   metricsDocFor (Namespace _ ["ClientMetrics"]) =
@@ -882,7 +882,6 @@ instance MetaTrace (TraceBlockFetchServerEvent blk) where
     metricsDocFor (Namespace [] ["SendBlock"]) =
       [("served.block", "This counter metric indicates how many blocks this node has served.")
       ,("served.block.latest", "This counter metric indicates how many chain tip blocks this node has served.")]
-
     metricsDocFor _ = []
 
     documentFor (Namespace [] ["SendBlock"]) = Just
@@ -893,6 +892,7 @@ instance MetaTrace (TraceBlockFetchServerEvent blk) where
 
 --------------------------------------------------------------------------------
 -- Metric for server block latest
+-- Only traces to EKG, no complete tracer!
 --------------------------------------------------------------------------------
 
 data ServedBlock = ServedBlock {
@@ -1284,20 +1284,13 @@ instance
     , IntM "mempoolBytes" (fromIntegral . unByteSize32 . msNumBytes $ mpSz)
     , CounterM "txsProcessedNum" (Just (fromIntegral $ length txs))
     ]
-  asMetrics (TraceMempoolManuallyRemovedTxs [] _txs1 mpSz) =
+  asMetrics (TraceMempoolManuallyRemovedTxs _txs _txs1 mpSz) =
     [ IntM "txsInMempool" (fromIntegral $ msNumTxs mpSz)
     , IntM "mempoolBytes" (fromIntegral . unByteSize32 . msNumBytes $ mpSz)
     ]
-  asMetrics (TraceMempoolManuallyRemovedTxs txs _txs1 mpSz) =
-    [ IntM "txsInMempool" (fromIntegral $ msNumTxs mpSz)
-    , IntM "mempoolBytes" (fromIntegral . unByteSize32 . msNumBytes $ mpSz)
-    , CounterM "txsProcessedNum" (Just (fromIntegral $ length txs))
-    ]
-
   asMetrics (TraceMempoolSynced (FallingEdgeWith duration)) =
     [ IntM "txsSyncDuration" (round $ 1000 * duration)
     ]
-
   asMetrics (TraceMempoolSynced RisingEdge) = []
 
 

diff --git a/cardano-node/src/Cardano/Node/Tracing/Tracers/P2P.hs b/cardano-node/src/Cardano/Node/Tracing/Tracers/P2P.hs
@@ -774,7 +774,7 @@ instance MetaTrace (TracePeerSelection SockAddr) where
     documentFor _ = Nothing
 
     metricsDocFor (Namespace [] ["ChurnAction"]) =
-      [ ("peerSelection.churn.DecreasedActivePeers.duration", "")
+     [ ("peerSelection.churn.DecreasedActivePeers.duration", "")
      , ("peerSelection.churn.DecreasedActiveBigLedgerPeers.duration", "")
      , ("peerSelection.churn.DecreasedEstablishedPeers.duration", "")
      , ("peerSelection.churn.DecreasedEstablishedBigLedgerPeers.duration", "")