CAD-2477 logging: move BlockFetchDecisions.connectedPeers into metric…

…s as well
IntersectMBO · Jan 15, 2021 · d6ace05 · d6ace05
1 parent 8a78605
commit d6ace05
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/cardano-node/src/Cardano/Tracing/Tracers.hs b/cardano-node/src/Cardano/Tracing/Tracers.hs
@@ -449,7 +449,7 @@ mkConsensusTracers trSel verb tr nodeKern fStats = do
     , Consensus.chainSyncServerHeaderTracer = tracerOnOff (traceChainSyncHeaderServer trSel) verb "ChainSyncHeaderServer" tr
     , Consensus.chainSyncServerBlockTracer = tracerOnOff (traceChainSyncHeaderServer trSel) verb "ChainSyncBlockServer" tr
     , Consensus.blockFetchDecisionTracer = tracerOnOff' (traceBlockFetchDecisions trSel) $
-        annotateSeverity $ teeTraceBlockFetchDecision verb elidedFetchDecision $ appendName "BlockFetchDecision" tr
+        annotateSeverity $ teeTraceBlockFetchDecision verb elidedFetchDecision tr
     , Consensus.blockFetchClientTracer = tracerOnOff (traceBlockFetchClient trSel) verb "BlockFetchClient" tr
     , Consensus.blockFetchServerTracer = tracerOnOff (traceBlockFetchServer trSel) verb "BlockFetchServer" tr
     , Consensus.forgeStateInfoTracer = tracerOnOff' (traceForgeStateInfo trSel) $
@@ -878,18 +878,19 @@ teeTraceBlockFetchDecision
     -> Tracer IO (WithSeverity [TraceLabelPeer peer (FetchDecision [Point (Header blk)])])
 teeTraceBlockFetchDecision verb eliding tr =
   Tracer $ \ev -> do
-    traceWith (teeTraceBlockFetchDecision' tr) ev
-    traceWith (teeTraceBlockFetchDecisionElide verb eliding tr) ev
-
+    traceWith (teeTraceBlockFetchDecision' meTr) ev
+    traceWith (teeTraceBlockFetchDecisionElide verb eliding bfdTr) ev
+ where
+   meTr  = appendName "metrics" tr
+   bfdTr = appendName "BlockFetchDecision" tr
 
 teeTraceBlockFetchDecision'
     :: Trace IO Text
     -> Tracer IO (WithSeverity [TraceLabelPeer peer (FetchDecision [Point (Header blk)])])
 teeTraceBlockFetchDecision' tr =
     Tracer $ \(WithSeverity _ peers) -> do
       meta <- mkLOMeta Info Confidential
-      let tr' = appendName "peers" tr
-      traceNamedObject tr' (meta, LogValue "connectedPeers" . PureI $ fromIntegral $ length peers)
+      traceNamedObject tr (meta, LogValue "connectedPeers" . PureI $ fromIntegral $ length peers)
 
 teeTraceBlockFetchDecisionElide
     :: ( Eq peer