[wip] import tracing instances from Network

Author: geo2a

cardano-node/cardano-node.cabal

@@ -187,7 +187,7 @@ library
                       , optparse-applicative
                       , ouroboros-consensus:{ouroboros-consensus, lmdb, lsm, cardano, diffusion, protocol} ^>= 1.0
                       , ouroboros-network:{api, ouroboros-network, orphan-instances, framework, protocols, framework-tracing, tracing} ^>= 0.24
-                      , cardano-diffusion:{api, cardano-diffusion, orphan-instances} ^>=0.1
+                      , cardano-diffusion:{api, cardano-diffusion, orphan-instances, tracing} ^>=0.1
                       , prettyprinter
                       , prettyprinter-ansi-terminal
                       , psqueues

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

@@ -20,6 +20,8 @@ module Cardano.Node.Tracing.Documentation
   , docTracersFirstPhase
   ) where
 
+import           Cardano.Network.Tracing.PeerSelection ()
+import           Cardano.Network.Tracing.PeerSelectionCounters ()
 import           Cardano.Git.Rev (gitRev)
 import           Cardano.Logging as Logging
 import           Cardano.Logging.Resources
@@ -108,6 +110,7 @@ import           Ouroboros.Network.TxSubmission.Outbound (TraceTxSubmissionOutbo
 import           Ouroboros.Network.Tracing ()
 import           Network.Mux.Tracing ()
 import qualified Network.Mux as Mux
+import qualified Cardano.Network.PeerSelection.ExtraRootPeers as Cardano
 
 import           Control.Monad (forM_)
 import           Data.Aeson.Types (ToJSON)
@@ -582,7 +585,7 @@ docTracersFirstPhase condConfigFileName = do
       ["Net", "PeerSelection", "Selection"]
     configureTracers configReflection trConfig [peerSelectionTr]
     peerSelectionTrDoc <- documentTracer (peerSelectionTr ::
-      Logging.Trace IO (TracePeerSelection Cardano.DebugPeerSelectionState PeerTrustable (Cardano.PublicRootPeers.ExtraPeers Socket.SockAddr) Cardano.ExtraTrace Socket.SockAddr))
+      Logging.Trace IO (TracePeerSelection Cardano.DebugPeerSelectionState PeerTrustable (Cardano.PublicRootPeers.ExtraPeers Socket.SockAddr) Socket.SockAddr))
 
     debugPeerSelectionTr  <-  mkCardanoTracer
       trBase trForward mbTrEKG
@@ -603,7 +606,7 @@ docTracersFirstPhase condConfigFileName = do
       ["Net", "PeerSelection", "Counters"]
     configureTracers configReflection trConfig [peerSelectionCountersTr]
     peerSelectionCountersTrDoc <- documentTracer (peerSelectionCountersTr ::
-      Logging.Trace IO (PeerSelectionCounters (Cardano.ExtraPeerSelectionSetsWithSizes Socket.SockAddr)))
+      Logging.Trace IO (PeerSelectionCounters (Cardano.ViewExtraPeers (Cardano.ExtraPeers Socket.SockAddr))))
 
     peerSelectionActionsTr  <-  mkCardanoTracer
       trBase trForward mbTrEKG