diff --git a/cardano-node/src/Cardano/Node/Run.hs b/cardano-node/src/Cardano/Node/Run.hs index b1d57302f25..38cddfff071 100644 --- a/cardano-node/src/Cardano/Node/Run.hs +++ b/cardano-node/src/Cardano/Node/Run.hs @@ -8,9 +8,11 @@ {-# LANGUAGE NamedFieldPuns #-} {-# LANGUAGE PackageImports #-} {-# LANGUAGE ScopedTypeVariables #-} -{-# LANGUAGE TypeApplications #-} {-# LANGUAGE TupleSections #-} +{-# LANGUAGE TypeApplications #-} + + {-# OPTIONS_GHC -Wno-unused-imports #-} #if !defined(mingw32_HOST_OS) @@ -103,12 +105,12 @@ import qualified Ouroboros.Network.Diffusion.P2P as P2P import Ouroboros.Network.NodeToClient (LocalAddress (..), LocalSocket (..)) import Ouroboros.Network.NodeToNode (AcceptedConnectionsLimit (..), ConnectionId, PeerSelectionTargets (..), RemoteAddress) +import Ouroboros.Network.PeerSelection.Bootstrap (UseBootstrapPeers (..)) + import Ouroboros.Network.PeerSelection.RelayAccessPoint (RelayAccessPoint (..)) import Ouroboros.Network.Protocol.ChainSync.Codec import Ouroboros.Network.Subscription (DnsSubscriptionTarget (..), IPSubscriptionTarget (..)) -import Ouroboros.Network.PeerSelection.Bootstrap - (UseBootstrapPeers (..)) import Cardano.Node.Configuration.Socket (SocketOrSocketInfo (..), gatherConfiguredSockets, getSocketOrSocketInfoAddr) @@ -125,11 +127,14 @@ import Cardano.Node.Protocol.Types import Cardano.Node.Queries import Cardano.Node.TraceConstraints (TraceConstraints) import Cardano.Tracing.Tracers -import Ouroboros.Network.PeerSelection.PeerSharing (PeerSharing (..)) -import Ouroboros.Network.PeerSelection.State.LocalRootPeers (HotValency, WarmValency) +import Ouroboros.Network.PeerSelection.Bootstrap (UseBootstrapPeers) import Ouroboros.Network.PeerSelection.LedgerPeers.Type (UseLedgerPeers) + +import Ouroboros.Network.PeerSelection.PeerSharing (PeerSharing (..)) import Ouroboros.Network.PeerSelection.PeerTrustable (PeerTrustable) -import Ouroboros.Network.PeerSelection.Bootstrap (UseBootstrapPeers) + +import Ouroboros.Network.PeerSelection.State.LocalRootPeers (HotValency, WarmValency) + {- HLINT ignore "Fuse concatMap/map" -} {- HLINT ignore "Redundant <$>" -} @@ -281,18 +286,10 @@ handleNodeWithTracers cmdPc nc0 p networkMagic blockType runP = do getStartupInfo nc p fp >>= mapM_ (traceWith $ startupTracer tracers) - Debug.trace "before calling nodeVersionTracer" $ pure () - traceWith (nodeVersionTracer tracers) getNodeVersion - Debug.trace "after calling nodeVersionTracer" $ pure () - - - traceWith (startupTracer tracers) (BlockForgingUpdate NotEffective) - - -- We ignore peer logging thread if it dies, but it will be killed -- when 'handleSimpleNode' terminates. handleSimpleNode blockType runP p2pMode tracers nc diff --git a/cardano-node/src/Cardano/Tracing/Tracers.hs b/cardano-node/src/Cardano/Tracing/Tracers.hs index 8a20cd84060..16660d75835 100644 --- a/cardano-node/src/Cardano/Tracing/Tracers.hs +++ b/cardano-node/src/Cardano/Tracing/Tracers.hs @@ -130,6 +130,8 @@ import qualified System.Metrics.Gauge as Gauge import qualified System.Metrics.Label as Label import qualified System.Remote.Monitoring as EKG +import Debug.Trace (trace) + {-# OPTIONS_GHC -Wno-redundant-constraints #-} -- needs different instances on ghc8 and on ghc9 @@ -367,18 +369,16 @@ mkTracers blockConfig tOpts@(TracingOnLegacy trSel) tr nodeKern ekgDirect enable _ -> pure () Nothing -> pure () traceVersionMetric :: Maybe EKGDirect -> NodeVersionTrace -> IO () - traceVersionMetric mbEKGDirect ev = do - + traceVersionMetric mbEKGDirect ev = trace "traceVersionMetric" $ do case mbEKGDirect of Just ekgDirect' -> case ev of - NodeVersionTrace {} -> + NodeVersionTrace {} -> trace "traceVersionMetric sending" $ sendEKGDirectPrometheusLabel ekgDirect' "cardano.node.metrics.cardano_build_info" - (getCardanoBuildInfo ev) - Nothing -> pure () + Nothing -> trace "no ekg direct" $ pure () diffusionTracers = Diffusion.Tracers { Diffusion.dtMuxTracer = muxTracer