Patches

IntersectMBO · May 5, 2024 · cea856a · cea856a
1 parent 004de7d
commit cea856a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/cardano-node/src/Cardano/Node/Run.hs b/cardano-node/src/Cardano/Node/Run.hs
@@ -241,8 +241,8 @@ handleNodeWithTracers cmdPc nc0 p networkMagic blockType runP = do
           blockForging <- snd (Api.protocolInfo runP)
           traceWith (startupTracer tracers)
                     (BlockForgingUpdate (if null blockForging
-                                          then EnabledBlockForging
-                                          else DisabledBlockForging))
+                                          then DisabledBlockForging
+                                          else EnabledBlockForging))
 
           handleSimpleNode blockType runP p2pMode tracers nc
             (\nk -> do
@@ -281,14 +281,16 @@ 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 ()
+
 
 
-          blockForging <- snd (Api.protocolInfo runP)
           traceWith (startupTracer tracers)
-                    (BlockForgingUpdate (if null blockForging
-                                          then EnabledBlockForging
-                                          else DisabledBlockForging))
+                    (BlockForgingUpdate NotEffective)
+
 
 
           -- We ignore peer logging thread if it dies, but it will be killed

diff --git a/cardano-node/src/Cardano/Tracing/Tracers.hs b/cardano-node/src/Cardano/Tracing/Tracers.hs
@@ -367,18 +367,19 @@ mkTracers blockConfig tOpts@(TracingOnLegacy trSel) tr nodeKern ekgDirect enable
               _ -> pure ()
         Nothing -> pure ()
    traceVersionMetric :: Maybe EKGDirect -> NodeVersionTrace -> IO ()
-   traceVersionMetric mbEKGDirect ev =
+   traceVersionMetric mbEKGDirect ev = do
+
       case mbEKGDirect of
         Just ekgDirect' ->
           case ev of
               NodeVersionTrace {} ->
                   sendEKGDirectPrometheusLabel
                     ekgDirect'
-                    "cardano_build_info"
+                    "cardano.node.metrics.cardano_build_info"
+
                     (getCardanoBuildInfo ev)
         Nothing -> pure ()
 
-
    diffusionTracers = Diffusion.Tracers
      { Diffusion.dtMuxTracer                     = muxTracer
      , Diffusion.dtHandshakeTracer               = handshakeTracer
@@ -694,9 +695,6 @@ sendEKGDirectPrometheusLabel ekgDirect name labels = do
         label pairs = "{" <> Text.intercalate "," pairs <> "} 1"
         pair (k, v) = k <> "=\"" <> v <> "\""
 
-
-
-
 --------------------------------------------------------------------------------
 -- Consensus Tracers
 --------------------------------------------------------------------------------