chainSyncServerHeaderTracer

IntersectMBO · May 30, 2023 · 1093eb5 · 1093eb5
1 parent 9a31bd8
commit 1093eb5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/cardano-node/src/Cardano/Tracing/OrphanInstances/Consensus.hs b/cardano-node/src/Cardano/Tracing/OrphanInstances/Consensus.hs
@@ -318,6 +318,13 @@ instance ConvertRawHash blk
       => Transformable Text IO (TraceChainSyncServerEvent blk) where
   trTransformer = trStructured
 
+instance (ToObject peer, ToObject (TraceChainSyncServerEvent blk))
+    => Transformable Text IO (TraceLabelPeer peer (TraceChainSyncServerEvent blk)) where
+  trTransformer = trStructured
+instance (StandardHash blk, Show peer)
+    => HasTextFormatter (TraceLabelPeer peer (TraceChainSyncServerEvent blk)) where
+  formatText a _ = pack $ show a
+
 
 instance ( ToObject (ApplyTxErr blk), ToObject (GenTx blk),
            ToJSON (GenTxId blk), LedgerSupportsMempool blk)

diff --git a/cardano-node/src/Cardano/Tracing/Tracers.hs b/cardano-node/src/Cardano/Tracing/Tracers.hs
@@ -697,11 +697,9 @@ mkConsensusTracers mbEKGDirect trSel verb tr nodeKern fStats = do
   pure Consensus.Tracers
     { Consensus.chainSyncClientTracer = tracerOnOff (traceChainSyncClient trSel) verb "ChainSyncClient" tr
     , Consensus.chainSyncServerHeaderTracer =
-        contramap (\(TraceLabelPeer _peer a) -> a) $
-          Tracer $ \ev -> do
-            traceWith (annotateSeverity . toLogObject' verb $ appendName "ChainSyncHeaderServer"
-                        (tracerOnOff' (traceChainSyncHeaderServer trSel) tr)) ev
-            traceServedCount mbEKGDirect ev
+           tracerOnOff' (traceChainSyncHeaderServer trSel)
+                        (annotateSeverity . toLogObject' verb $ appendName "ChainSyncHeaderServer" tr)
+        <> (\(TraceLabelPeer _ ev) -> ev) `contramap` Tracer (traceServedCount mbEKGDirect)
     , Consensus.chainSyncServerBlockTracer = tracerOnOff (traceChainSyncBlockServer trSel) verb "ChainSyncBlockServer" tr
     , Consensus.blockFetchDecisionTracer = tracerOnOff' (traceBlockFetchDecisions trSel) $
         annotateSeverity $ teeTraceBlockFetchDecision verb elidedFetchDecision tr