Skip to content

Commit be199b6

Browse files
Denis Shevchenkodisassembler
authored andcommitted
cardano-node-3664: restore legacy metrics.
(cherry picked from commit 9ff3ecd)
1 parent 36a3c0f commit be199b6

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

cardano-node/src/Cardano/Node/Configuration/Logging.hs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ module Cardano.Node.Configuration.Logging
1010
( LoggingLayer (..)
1111
, EKGDirect(..)
1212
, createLoggingLayer
13+
, nodeBasicInfo
1314
, shutdownLoggingLayer
1415
, traceCounter
1516
-- re-exports

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import Data.Text (breakOn, pack, take)
3131
import qualified Data.Text as Text
3232
import qualified Data.Text.Encoding as Text
3333
import Data.Time.Clock (getCurrentTime)
34+
import Data.Time.Clock.POSIX (utcTimeToPOSIXSeconds)
3435
import Data.Version (showVersion)
3536
import Network.HostName (getHostName)
3637
import Network.Socket (Socket)
@@ -45,6 +46,7 @@ import System.Posix.Types (FileMode)
4546
import System.Win32.File
4647
#endif
4748

49+
import Cardano.BM.Data.LogItem (LogObject (..))
4850
import Cardano.BM.Data.Tracer (ToLogObject (..), TracingVerbosity (..))
4951
import Cardano.BM.Data.Transformers (setHostname)
5052
import Cardano.BM.Trace
@@ -53,7 +55,7 @@ import Paths_cardano_node (version)
5355
import qualified Cardano.Crypto.Libsodium as Crypto
5456

5557
import Cardano.Node.Configuration.Logging (LoggingLayer (..), createLoggingLayer,
56-
shutdownLoggingLayer)
58+
nodeBasicInfo, shutdownLoggingLayer)
5759
import Cardano.Node.Configuration.NodeAddress
5860
import Cardano.Node.Configuration.POM (NodeConfiguration (..),
5961
PartialNodeConfiguration (..), SomeNetworkP2PMode (..),
@@ -189,6 +191,13 @@ handleNodeWithTracers cmdPc nc p networkMagic runP = do
189191
let tracer = contramap pack $ toLogObject trace
190192
logTracingVerbosity nc tracer
191193

194+
-- Legacy logging infrastructure must trace 'nodeStartTime' and 'nodeBasicInfo'.
195+
startTime <- getCurrentTime
196+
traceCounter "nodeStartTime" trace (ceiling $ utcTimeToPOSIXSeconds startTime)
197+
nbi <- nodeBasicInfo nc p startTime
198+
forM_ nbi $ \(LogObject nm mt content) ->
199+
traceNamedObject (appendName nm trace) (mt, content)
200+
192201
(,Just loggingLayer) <$>
193202
mkTracers
194203
(Consensus.configBlock cfg)

0 commit comments

Comments
 (0)