cardano-node: Consistency checks and fixes

* BlockFetchSerialized Tracer resolution
* Consistency checks
* Configuration check
* Tracer config consistency tests
* MuxTracer fixes

Author: jutaro

cardano-node/cardano-node.cabal

@@ -85,6 +85,7 @@ library
                         Cardano.Node.TraceConstraints
                         Cardano.Node.Tracing
                         Cardano.Node.Tracing.API
+                        Cardano.Node.Tracing.Consistency
                         Cardano.Node.Tracing.Compat
                         Cardano.Node.Tracing.DefaultTraceConfig
                         Cardano.Node.Tracing.Documentation
@@ -262,6 +263,7 @@ test-suite cardano-node-test
                         Test.Cardano.Node.Gen
                         Test.Cardano.Node.Json
                         Test.Cardano.Node.POM
+                        Test.Cardano.Tracing.NewTracing.Consistency
                         Test.Cardano.Tracing.OrphanInstances.HardFork
 
   ghc-options:          -threaded -rtsopts -with-rtsopts=-N -with-rtsopts=-T

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

@@ -15,17 +15,21 @@ import           Cardano.Logging (LogFormatting)
 import           Cardano.Node.Queries (ConvertTxId, GetKESInfo (..), HasKESInfo (..),
                    HasKESMetricsData (..), LedgerQueries)
 import           Cardano.Tracing.HasIssuer (HasIssuer)
+
 import           Ouroboros.Consensus.Block (BlockProtocol, CannotForge, ForgeStateUpdateError,
-                   Header)
+                   GetHeader, HasHeader, Header)
 import           Ouroboros.Consensus.HeaderValidation (OtherHeaderEnvelopeError)
 import           Ouroboros.Consensus.Ledger.Abstract (LedgerError)
 import           Ouroboros.Consensus.Ledger.Inspect (LedgerEvent, LedgerUpdate, LedgerWarning)
 import           Ouroboros.Consensus.Ledger.SupportsMempool (ApplyTxErr, HasTxId, HasTxs (..))
 import           Ouroboros.Consensus.Node.NetworkProtocolVersion
                    (HasNetworkProtocolVersion (BlockNodeToClientVersion, BlockNodeToNodeVersion))
+import           Ouroboros.Consensus.Node.Run (RunNode, SerialiseNodeToNodeConstraints)
 import           Ouroboros.Consensus.Protocol.Abstract (ValidationErr)
 import           Ouroboros.Consensus.Shelley.Ledger.Mempool (GenTx, TxId)
 
+import           Ouroboros.Network.Block (Serialised)
+
 import           Data.Aeson
 import           Data.Set
 
@@ -41,6 +45,7 @@ type TraceConstraints blk =
     , HasKESMetricsData blk
     , HasKESInfo blk
     , GetKESInfo blk
+    , RunNode blk
 
     , ToObject (ApplyTxErr blk)
     , ToObject (GenTx blk)

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

@@ -23,7 +23,7 @@ import           Network.Mux.Trace (TraceLabelPeer (..))
 
 import           Ouroboros.Consensus.Ledger.Inspect (LedgerEvent)
 import           Ouroboros.Consensus.MiniProtocol.ChainSync.Client (TraceChainSyncClientEvent)
-import           Ouroboros.Consensus.Node (NetworkP2PMode, RunNode)
+import           Ouroboros.Consensus.Node (NetworkP2PMode)
 import           Ouroboros.Network.ConnectionId (ConnectionId)
 import           Ouroboros.Network.Magic (NetworkMagic)
 import           Ouroboros.Network.NodeToClient (withIOManager)
@@ -47,8 +47,7 @@ import           Cardano.Node.Tracing.Tracers.Resources (startResourceTracer)
 
 initTraceDispatcher ::
   forall blk p2p.
-  ( RunNode blk
-  , TraceConstraints blk
+  ( TraceConstraints blk
   , LogFormatting (LedgerEvent blk)
   , LogFormatting
     (TraceLabelPeer (ConnectionId RemoteAddress) (TraceChainSyncClientEvent blk))

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

@@ -28,21 +28,22 @@ defaultCardanoConfig = emptyTraceConfig {
          [ ConfSeverity (SeverityF (Just Info))])
     ,(["Net", "ConnectionManager", "Remote"],
          [ ConfSeverity (SeverityF (Just Info))])
-    ,(["DNSSubscription"],
+    ,(["Net", "Subscription", "DNS"],
          [ ConfSeverity (SeverityF (Just Info))])
-    ,(["DiffusionInit"],
+    ,(["Startup", "DiffusionInit"],
          [ ConfSeverity (SeverityF (Just Info))])
-    ,(["ErrorPolicy"],
+    ,(["Net", "ErrorPolicy"],
          [ ConfSeverity (SeverityF (Just Info))])
-    ,(["Forge"],
+    ,(["Forge", "Loop"],
          [ ConfSeverity (SeverityF (Just Info))])
-        -- includes ["Forge", "KESInfo"]
+--     ,(["Forge", "KESInfo"],
+--          [ ConfSeverity (SeverityF (Just Info))])
     ,(["Net", "InboundGovernor", "Remote"],
          [ ConfSeverity (SeverityF (Just Info))])
         -- includes ["Net", "InboundGovernor", "Remote", "Transition"]
-    ,(["IpSubscription"],
+    ,(["Net", "Subscription", "IP"],
          [ ConfSeverity (SeverityF (Just Info))])
-    ,(["LocalErrorPolicy"],
+    ,(["Net", "ErrorPolicy", "Local"],
          [ ConfSeverity (SeverityF (Just Info))])
     ,(["Mempool"],
          [ ConfSeverity (SeverityF (Just Info))])