From 6eb978e93d41c947176b0aa50fc0ac4e29c1fc5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Nicklisch-Franken?= <jnf@arcor.de>
Date: Tue, 28 Jan 2025 16:39:27 +0100
Subject: [PATCH] cardano-node: fixes

---
 .../src/Cardano/Node/Configuration/Logging.hs | 63 +++++++++----------
 1 file changed, 30 insertions(+), 33 deletions(-)

diff --git a/cardano-node/src/Cardano/Node/Configuration/Logging.hs b/cardano-node/src/Cardano/Node/Configuration/Logging.hs
index 769864ddffd..2745b15c46a 100644
--- a/cardano-node/src/Cardano/Node/Configuration/Logging.hs
+++ b/cardano-node/src/Cardano/Node/Configuration/Logging.hs
@@ -28,28 +28,6 @@ module Cardano.Node.Configuration.Logging
 import           Cardano.Api (textShow)
 import qualified Cardano.Api as Api
 
-import qualified Control.Concurrent as Conc
-import qualified Control.Concurrent.Async as Async
-import           Control.Concurrent.MVar (MVar, newMVar)
-import           Control.Concurrent.STM (STM)
-import           Control.Exception (IOException)
-import           Control.Exception.Safe (MonadCatch)
-import           Control.Monad (forM_, forever, void, when)
-import           Control.Monad.Except (ExceptT)
-import           Control.Monad.IO.Class (MonadIO (..))
-import           Control.Monad.Trans.Except.Extra (catchIOExceptT)
-import           "contra-tracer" Control.Tracer
-import           Data.List (nub)
-import qualified Data.Map.Strict as Map
-import           Data.Maybe (isJust)
-import           Data.Text (Text, pack)
-import           Data.Time.Clock (UTCTime, getCurrentTime)
-import           Data.Version (showVersion)
-import           System.Metrics.Counter (Counter)
-import           System.Metrics.Gauge (Gauge)
-import           System.Metrics.Label (Label)
-import qualified System.Remote.Monitoring.Wai as EKG
-
 import           Cardano.BM.Backend.Aggregation (plugin)
 import           Cardano.BM.Backend.EKGView (plugin)
 import           Cardano.BM.Backend.Monitoring (plugin)
@@ -65,17 +43,21 @@ import           Cardano.BM.Data.LogItem (LOContent (..), LOMeta (..), LoggerNam
 import qualified Cardano.BM.Observer.Monadic as Monadic
 import qualified Cardano.BM.Observer.STM as Stm
 import           Cardano.BM.Plugin (loadPlugin)
-#if defined(SYSTEMD)
 import           Cardano.BM.Scribe.Systemd (plugin)
-#endif
 import           Cardano.BM.Setup (setupTrace_, shutdown)
 import           Cardano.BM.Stats
 import           Cardano.BM.Stats.Resources
 import qualified Cardano.BM.Trace as Trace
 import           Cardano.BM.Tracing
-
 import qualified Cardano.Chain.Genesis as Gen
+import           Cardano.Git.Rev (gitRev)
 import qualified Cardano.Ledger.Shelley.API as SL
+import           Cardano.Node.Configuration.POM (NodeConfiguration (..), ncProtocol)
+import           Cardano.Node.Protocol.Types (SomeConsensusProtocol (..))
+import           Cardano.Node.Types
+import           Cardano.Slotting.Slot (EpochSize (..))
+import           Cardano.Tracing.Config (TraceOptions (..))
+import           Cardano.Tracing.OrphanInstances.Common ()
 import qualified Ouroboros.Consensus.BlockchainTime.WallClock.Types as WCT
 import           Ouroboros.Consensus.Byron.Ledger.Conversions
 import           Ouroboros.Consensus.Cardano.Block
@@ -86,13 +68,28 @@ import           Ouroboros.Consensus.HardFork.Combinator.Degenerate
 import           Ouroboros.Consensus.Node.ProtocolInfo
 import           Ouroboros.Consensus.Shelley.Ledger.Ledger
 
-import           Cardano.Git.Rev (gitRev)
-import           Cardano.Node.Configuration.POM (NodeConfiguration (..), ncProtocol)
-import           Cardano.Node.Protocol.Types (SomeConsensusProtocol (..))
-import           Cardano.Node.Types
-import           Cardano.Slotting.Slot (EpochSize (..))
-import           Cardano.Tracing.Config (TraceOptions (..))
-import           Cardano.Tracing.OrphanInstances.Common ()
+import qualified Control.Concurrent as Conc
+import qualified Control.Concurrent.Async as Async
+import           Control.Concurrent.MVar (MVar, newMVar)
+import           Control.Concurrent.STM (STM)
+import           Control.Exception (IOException)
+import           Control.Exception.Safe (MonadCatch)
+import           Control.Monad (forM_, forever, void, when)
+import           Control.Monad.Except (ExceptT)
+import           Control.Monad.IO.Class (MonadIO (..))
+import           Control.Monad.Trans.Except.Extra (catchIOExceptT)
+import           Data.List (nub)
+import qualified Data.Map.Strict as Map
+import           Data.Maybe (isJust)
+import           Data.Text (Text, pack)
+import           Data.Time.Clock (UTCTime, getCurrentTime)
+import           Data.Version (showVersion)
+import           GHC.Conc (labelThread, myThreadId)
+import           System.Metrics.Counter (Counter)
+import           System.Metrics.Gauge (Gauge)
+import           System.Metrics.Label (Label)
+import qualified System.Remote.Monitoring.Wai as EKG
+
 import           Paths_cardano_node (version)
 
 --------------------------------
@@ -286,7 +283,7 @@ createLoggingLayer ver nodeConfig' p = do
 
    startCapturingResources _ tr = do
      void . Async.async $ do
-      myThreadId >>= flip labelThread "Metrics capturing (cardano-node)"
+      myThreadId >>= flip labelThread "Resource capturing (old tracing)"
       forever $ do
        readResourceStats
          >>= maybe (pure ())