Merge pull request #6387 from IntersectMBO/coot/removed-PeerT-tracer

Removed PeerT tracer

Author: mgmeier

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

@@ -189,8 +189,7 @@ initialTraceConfig = TraceConfig {
           ]
     , tcForwarder = Just defaultForwarder {tofQueueSize = 4096}
     , tcNodeName = Nothing
-    , tcPeerFrequency = Just 2000 -- Every 2 seconds
-    , tcResourceFrequency = Just 1000 -- Every second
+    , tcResourceFrequency = Nothing
     , tcMetricsPrefix = Nothing
     , tcLedgerMetricsFrequency = Nothing
     }

cardano-node/cardano-node.cabal

@@ -97,7 +97,6 @@ library
                         Cardano.Node.Tracing.Formatting
                         Cardano.Node.Tracing.NodeInfo
                         Cardano.Node.Tracing.NodeStartupInfo
-                        Cardano.Node.Tracing.Peers
                         Cardano.Node.Tracing.Render
                         Cardano.Node.Tracing.StateRep
                         Cardano.Node.Tracing.Tracers
@@ -113,7 +112,6 @@ library
                         Cardano.Node.Tracing.Tracers.NodeToNode
                         Cardano.Node.Tracing.Tracers.NodeVersion
                         Cardano.Node.Tracing.Tracers.P2P
-                        Cardano.Node.Tracing.Tracers.Peer
                         Cardano.Node.Tracing.Tracers.Resources
                         Cardano.Node.Tracing.Tracers.Shutdown
                         Cardano.Node.Tracing.Tracers.Startup
@@ -127,7 +125,6 @@ library
                         Cardano.Tracing.OrphanInstances.HardFork
                         Cardano.Tracing.OrphanInstances.Network
                         Cardano.Tracing.OrphanInstances.Shelley
-                        Cardano.Tracing.Peer
                         Cardano.Tracing.Render
                         Cardano.Tracing.Shutdown
                         Cardano.Tracing.Startup

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

@@ -17,7 +17,6 @@ import           Cardano.Node.Tracing.Tracers.ConsensusStartupException
                    (ConsensusStartupException (..))
 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
@@ -50,6 +49,5 @@ data Tracers peer localPeer blk m = Tracers
   , nodeStartupInfoTracer :: !(Tracer IO NodeStartupInfo)
   , 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

@@ -23,7 +23,6 @@ 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
 import           Ouroboros.Consensus.Ledger.Inspect (LedgerEvent)
@@ -98,11 +97,6 @@ initTraceDispatcher nc p networkMagic nodeKernel noBlockForging = do
     (fromMaybe ledgerMetricsDefaultFreq (tcLedgerMetricsFrequency trConfig))
     nodeKernel
 
-  startPeerTracer
-    (peersTracer tracers)
-    nodeKernel
-    (fromMaybe 2000 (tcPeerFrequency trConfig))
-
   pure tracers
  where
   -- this is the backwards compatible default: block producers emit these metrics every second, relays never.

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

@@ -32,7 +32,6 @@ import           Cardano.Node.Tracing.Tracers.NodeToClient ()
 import           Cardano.Node.Tracing.Tracers.NodeToNode ()
 import           Cardano.Node.Tracing.Tracers.NodeVersion (NodeVersionTrace)
 import           Cardano.Node.Tracing.Tracers.P2P ()
-import           Cardano.Node.Tracing.Tracers.Peer
 import           Cardano.Node.Tracing.Tracers.Shutdown ()
 import           Cardano.Node.Tracing.Tracers.Startup ()
 import qualified Cardano.Network.PeerSelection.Governor.PeerSelectionState as Cardano
@@ -133,8 +132,6 @@ getAllNamespaces =
     -- NodeInfo tracer
     let stateNS = map (nsGetTuple . nsReplacePrefix ["NodeState"])
                       (allNamespaces :: [Namespace SR.NodeState])
-        peersNS = map (nsGetTuple . nsReplacePrefix ["Net", "Peers", "List"])
-                      (allNamespaces :: [Namespace [PeerT blk]])
         resourcesNS = map nsGetTuple
                           (allNamespaces :: [Namespace ResourceStats])
         ledgerMetricsNS = map nsGetTuple
@@ -385,7 +382,6 @@ getAllNamespaces =
 
         allNamespaces' :: [([T.Text],[T.Text])] =
             stateNS
-            <> peersNS
             <> resourcesNS
             <> ledgerMetricsNS
             <> startupNS

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

@@ -45,7 +45,6 @@ import           Cardano.Node.Tracing.Tracers.NodeToClient ()
 import           Cardano.Node.Tracing.Tracers.NodeToNode ()
 import           Cardano.Node.Tracing.Tracers.NodeVersion (NodeVersionTrace)
 import           Cardano.Node.Tracing.Tracers.P2P ()
-import           Cardano.Node.Tracing.Tracers.Peer
 import           Cardano.Node.Tracing.Tracers.Shutdown ()
 import           Cardano.Node.Tracing.Tracers.Startup ()
 import qualified Cardano.Network.PeerSelection.Governor.PeerSelectionState as Cardano
@@ -234,13 +233,6 @@ docTracersFirstPhase condConfigFileName = do
     configureTracers configReflection trConfig [stateTr]
     stateTrDoc <- documentTracer (stateTr :: Logging.Trace IO SR.NodeState)
 
-    --  Peers tracer
-    peersTr   <- mkCardanoTracer
-                trBase trForward mbTrEKG
-                ["Net", "Peers", "List"]
-    configureTracers configReflection trConfig [peersTr]
-    peersTrDoc <- documentTracer (peersTr :: Logging.Trace IO  [PeerT blk])
-
     -- Resource tracer
     resourcesTr <- mkCardanoTracer
                 trBase trForward mbTrEKG
@@ -716,7 +708,6 @@ docTracersFirstPhase condConfigFileName = do
             <> startupTrDoc
             <> shutdownTrDoc
             <> nodeVersionDoc
-            <> peersTrDoc
             <> chainDBTrDoc
             <> replayBlockTrDoc
 -- Consensus

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

@@ -24,7 +24,6 @@ import           Cardano.Node.TraceConstraints
 import           Cardano.Node.Tracing
 import           Cardano.Node.Tracing.Consistency (checkNodeTraceConfiguration')
 import           Cardano.Node.Tracing.Formatting ()
-import           Cardano.Node.Tracing.Peers (traceNodePeers)
 import qualified Cardano.Node.Tracing.StateRep as SR
 import           Cardano.Node.Tracing.Tracers.BlockReplayProgress
 import           Cardano.Node.Tracing.Tracers.ChainDB
@@ -101,13 +100,6 @@ mkDispatchTracers nodeKernel trBase trForward mbTrEKG trDataPoint trConfig p = d
     !stateTr <- mkCardanoTracer trBase trForward mbTrEKG ["NodeState"]
     configureTracers configReflection trConfig [stateTr]
 
-    !nodePeersDP <- mkDataPointTracer trDataPoint
-    configureTracers configReflection trConfig [nodePeersDP]
-
-    !peersTr <- mkCardanoTracer trBase trForward mbTrEKG
-                    ["Net", "Peers", "List"]
-    configureTracers configReflection trConfig [peersTr]
-
     !resourcesTr <- mkCardanoTracer trBase trForward mbTrEKG []
     configureTracers configReflection trConfig [resourcesTr]
 
@@ -190,8 +182,6 @@ mkDispatchTracers nodeKernel trBase trForward mbTrEKG trDataPoint trConfig p = d
                           <> Tracer (traceWith nodeStateDP)
       , nodeVersionTracer = Tracer (traceWith nodeVersionTr)
       , resourcesTracer = Tracer (traceWith resourcesTr)
-      , peersTracer     = Tracer (traceWith peersTr)
-                          <> Tracer (traceNodePeers nodePeersDP)
       , ledgerMetricsTracer = Tracer (traceWith ledgerMetricsTr)
     }