Update ouroboros-network & tracing changes

CODEOWNERS

@@ -41,4 +41,10 @@ cardano-node/src/Cardano/Tracing/OrphanInstances/Network.hs   @devops @coot @kar
 cardano-node/src/Cardano/Node/Configuration/Logging.hs        @devops
 cardano-node/src/Cardano/Node/Configuration/Socket.hs         @devops
 cardano-node/src/Cardano/Node/Tracing                         @deepfire @denisshevchenko @jutaro
+cardano-node/src/Cardano/Node/Tracing/Tracers/Diffusion.hs    @deepfire @denisshevchenko @jutaro @coot @karknu
+cardano-node/src/Cardano/Node/Tracing/Tracers/NodeToClient.hs @deepfire @denisshevchenko @jutaro @coot @karknu
+cardano-node/src/Cardano/Node/Tracing/Tracers/NodeToServer.hs @deepfire @denisshevchenko @jutaro @coot @karknu
+cardano-node/src/Cardano/Node/Tracing/Tracers/NonP2P.hs       @deepfire @denisshevchenko @jutaro @coot @karknu
+cardano-node/src/Cardano/Node/Tracing/Tracers/P2P.hs          @deepfire @denisshevchenko @jutaro @coot @karknu
+cardano-node/src/Cardano/Node/Tracing/Tracers/Peer.hs         @deepfire @denisshevchenko @jutaro @coot @karknu
 cardano-node/src/Cardano/Node/Run.hs                          @devops

cabal.project

@@ -240,8 +240,8 @@ source-repository-package
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: d2d219a86cda42787325bb8c20539a75c2667132
-  --sha256: 18xk7r0h2pxrbx76d6flsxifh0a9rz1cj1rjqs1pbs5kdmy8b7kx
+  tag: 4fac197b6f0d2ff60dc3486c593b68dc00969fbf
+  --sha256: 1b43vbdsr9m3ry1kgag2p2ixpv54gw7a4vvmndxl6knqg8qbsb8b
   subdir:
     io-sim
     io-classes

cardano-api/src/Cardano/Api/IPC.hs

@@ -291,10 +291,17 @@ mkVersionedProtocols networkid ptcl unversionedClients =
                 (maybe Net.localStateQueryPeerNull
                        Net.Query.localStateQueryClientPeer
                        localStateQueryClientForBlock)
+        , localTxMonitorProtocol =
+            Net.InitiatorProtocolOnly $
+              Net.MuxPeer
+                nullTracer
+                cTxMonitorCodec
+                Net.localTxMonitorPeerNull
         }
       where
         Consensus.Codecs {
           Consensus.cChainSyncCodec,
+          Consensus.cTxMonitorCodec,
           Consensus.cTxSubmissionCodec,
           Consensus.cStateQueryCodec
         } = Consensus.clientCodecs codecConfig ptclBlockVersion ptclVersion

cardano-node-chairman/app/Cardano/Chairman.hs

@@ -477,12 +477,20 @@ localInitiatorNetworkApplication
               (chainSyncClientPeer $
                   chainSyncClient chairmanTracer sockPath chainsVar securityParam)
 
+      , localTxMonitorProtocol =
+          InitiatorProtocolOnly $
+            MuxPeer
+              nullTracer
+              cTxMonitorCodec
+              localTxMonitorPeerNull
+
       , localTxSubmissionProtocol =
           InitiatorProtocolOnly $
             MuxPeer
               localTxSubmissionTracer
               cTxSubmissionCodec
               localTxSubmissionPeerNull
+
       , localStateQueryProtocol =
           InitiatorProtocolOnly $
             MuxPeer
@@ -493,6 +501,7 @@ localInitiatorNetworkApplication
       where
         Codecs
             { cChainSyncCodec
+            , cTxMonitorCodec
             , cTxSubmissionCodec
             , cStateQueryCodec
             } =

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

@@ -51,7 +51,7 @@ import qualified Ouroboros.Consensus.Node.Tracers as Consensus
 import qualified Ouroboros.Consensus.Storage.ChainDB as ChainDB
 import qualified Ouroboros.Consensus.Storage.LedgerDB.OnDisk as LedgerDB
 
-import qualified Ouroboros.Network.BlockFetch.ClientState as BlockFetch
+import           Network.Mux.Trace (TraceLabelPeer (..))
 import           Ouroboros.Network.ConnectionId (ConnectionId)
 import qualified Ouroboros.Network.Diffusion as Diffusion
 import qualified Ouroboros.Network.Diffusion.NonP2P as NonP2P
@@ -68,7 +68,7 @@ mkDispatchTracers
 
   , LogFormatting (LedgerEvent blk)
   , LogFormatting
-    (BlockFetch.TraceLabelPeer
+    (TraceLabelPeer
       (ConnectionId RemoteAddress) (TraceChainSyncClientEvent blk))
   )
   => NodeKernelData blk
@@ -198,7 +198,7 @@ mkConsensusTracers :: forall blk.
   ( Consensus.RunNode blk
   , LogFormatting (ChainDB.InvalidBlockReason blk)
   , TraceConstraints blk
-  , LogFormatting (BlockFetch.TraceLabelPeer
+  , LogFormatting (TraceLabelPeer
                     (ConnectionId RemoteAddress) (TraceChainSyncClientEvent blk))
   )
   => Trace IO FormattedMessage
@@ -356,30 +356,43 @@ mkNodeToClientTracers :: forall blk.
   -> TraceConfig
   -> IO (NodeToClient.Tracers IO (ConnectionId LocalAddress) blk DeserialiseFailure)
 mkNodeToClientTracers trBase trForward mbTrEKG _trDataPoint trConfig = do
-    chainSyncTr  <-  mkCardanoTracer
-                trBase trForward mbTrEKG
-                "ChainSyncClient"
-                namesForTChainSync
-                severityTChainSync
-                allPublic
+    chainSyncTr <-
+      mkCardanoTracer
+        trBase trForward mbTrEKG
+        "ChainSyncClient"
+        namesForTChainSync
+        severityTChainSync
+        allPublic
     configureTracers trConfig docTChainSync [chainSyncTr]
-    txSubmissionTr  <-  mkCardanoTracer
-                trBase trForward mbTrEKG
-                "TxSubmissionClient"
-                namesForTTxSubmission
-                severityTTxSubmission
-                allPublic
+    txMonitorTr <-
+      mkCardanoTracer
+        trBase trForward mbTrEKG
+        "TxMonitorClient"
+        namesForTTxMonitor
+        severityTTxMonitor
+        allPublic
+    configureTracers trConfig docTTxMonitor [txMonitorTr]
+    txSubmissionTr <-
+      mkCardanoTracer
+        trBase trForward mbTrEKG
+        "TxSubmissionClient"
+        namesForTTxSubmission
+        severityTTxSubmission
+        allPublic
     configureTracers trConfig docTTxSubmission [txSubmissionTr]
-    stateQueryTr  <-  mkCardanoTracer
-                trBase trForward mbTrEKG
-                "StateQueryClient"
-                namesForTStateQuery
-                severityTStateQuery
-                allPublic
+    stateQueryTr <-
+      mkCardanoTracer
+        trBase trForward mbTrEKG
+        "StateQueryClient"
+        namesForTStateQuery
+        severityTStateQuery
+        allPublic
     configureTracers trConfig docTStateQuery [stateQueryTr]
     pure $ NtC.Tracers
       { NtC.tChainSyncTracer = Tracer $
           traceWith chainSyncTr
+      , NtC.tTxMonitorTracer = Tracer $
+          traceWith txMonitorTr
       , NtC.tTxSubmissionTracer = Tracer $
           traceWith txSubmissionTr
       , NtC.tStateQueryTracer = Tracer $
@@ -584,6 +597,13 @@ mkDiffusionTracersExtra trBase trForward mbTrEKG _trDataPoint trConfig EnabledP2
       severityConnectionManager
       allPublic
     configureTracers trConfig docConnectionManager [connectionManagerTr]
+    connectionManagerTransitionsTr  <-  mkCardanoTracer
+      trBase trForward mbTrEKG
+      "ConnectionManagerTransition"
+      (namesForConnectionManagerTransition @RemoteAddress)
+      severityConnectionManagerTransition
+      allPublic
+    configureTracers trConfig docConnectionManagerTransition [connectionManagerTransitionsTr]
     serverTr  <-  mkCardanoTracer
       trBase trForward mbTrEKG
       "Server"
@@ -598,6 +618,13 @@ mkDiffusionTracersExtra trBase trForward mbTrEKG _trDataPoint trConfig EnabledP2
       severityInboundGovernor
       allPublic
     configureTracers trConfig docInboundGovernorRemote [inboundGovernorTr]
+    inboundGovernorTransitionsTr  <-  mkCardanoTracer
+      trBase trForward mbTrEKG
+      "InboundGovernorTransition"
+      namesForInboundGovernorTransition
+      severityInboundGovernorTransition
+      allPublic
+    configureTracers trConfig docInboundGovernorRemote [inboundGovernorTr]
     localConnectionManagerTr  <-  mkCardanoTracer
       trBase trForward mbTrEKG
       "LocalConnectionManager"
@@ -636,14 +663,14 @@ mkDiffusionTracersExtra trBase trForward mbTrEKG _trDataPoint trConfig EnabledP2
                  traceWith peerSelectionActionsTr
              , P2P.dtConnectionManagerTracer = Tracer $
                  traceWith connectionManagerTr
-             , P2P.dtConnectionManagerTransitionTracer = mempty
-                --TODO Add transition tracers later
+             , P2P.dtConnectionManagerTransitionTracer = Tracer $
+                 traceWith connectionManagerTransitionsTr
              , P2P.dtServerTracer = Tracer $
                  traceWith serverTr
              , P2P.dtInboundGovernorTracer = Tracer $
                  traceWith inboundGovernorTr
-             , P2P.dtInboundGovernorTransitionTracer = mempty
-                --TODO Add transition tracers later
+             , P2P.dtInboundGovernorTransitionTracer = Tracer $
+                 traceWith inboundGovernorTransitionsTr
              , P2P.dtLocalConnectionManagerTracer =  Tracer $
                  traceWith localConnectionManagerTr
              , P2P.dtLocalServerTracer = Tracer $