Merge pull request #6171 from IntersectMBO/js/tracing-severities

Align tracing severities among tracing systems

Author: mgmeier

cardano-node/src/Cardano/Node/Tracing/Tracers/Consensus.hs

@@ -1759,7 +1759,7 @@ instance MetaTrace (TraceForgeEvent blk) where
   severityFor (Namespace _ ["LedgerState"]) _ = Just Debug
   severityFor (Namespace _ ["NoLedgerView"]) _ = Just Error
   severityFor (Namespace _ ["LedgerView"]) _ = Just Debug
-  severityFor (Namespace _ ["ForgeStateUpdateError"]) _ = Just Error
+  severityFor (Namespace _ ["ForgeStateUpdateError"]) _ = Just Critical
   severityFor (Namespace _ ["NodeCannotForge"]) _ = Just Error
   severityFor (Namespace _ ["NodeNotLeader"]) _ = Just Info
   severityFor (Namespace _ ["NodeIsLeader"]) _ = Just Info
@@ -1772,6 +1772,9 @@ instance MetaTrace (TraceForgeEvent blk) where
   severityFor (Namespace _ ["AdoptionThreadDied"]) _ = Just Error
   severityFor _ _ = Nothing
 
+  privacyFor (Namespace _ ["ForgeStateUpdateError"]) _ = Just Confidential
+  privacyFor _ _ = Just Public
+
   metricsDocFor (Namespace _ ["StartLeadershipCheck"]) =
     [("Forge.about-to-lead", "")]
   metricsDocFor (Namespace _ ["SlotIsImmutable"]) =

cardano-node/src/Cardano/Tracing/Tracers.hs

@@ -867,22 +867,24 @@ mkConsensusTracers mbEKGDirect trSel verb tr nodeKern fStats = do
    mkForgeTracers :: IO ForgeTracers
    mkForgeTracers = do
      -- We probably don't want to pay the extra IO cost per-counter-increment. -- sk
-     staticMeta <- mkLOMeta Critical Confidential
+     metaCritical <- mkLOMeta Critical Confidential
+     metaInfo <- mkLOMeta Info Public
+     metaError <- mkLOMeta Error Public
      let name :: LoggerName = "metrics.Forge"
      ForgeTracers
-       <$> counting (liftCounting staticMeta name "forged" tr)
-       <*> counting (liftCounting staticMeta name "forge-about-to-lead" tr)
-       <*> counting (liftCounting staticMeta name "could-not-forge" tr)
-       <*> counting (liftCounting staticMeta name "adopted" tr)
-       <*> counting (liftCounting staticMeta name "didnt-adopt" tr)
-       <*> counting (liftCounting staticMeta name "forged-invalid" tr)
-       <*> counting (liftCounting staticMeta name "node-not-leader" tr)
-       <*> counting (liftCounting staticMeta name "cannot-forge" tr)
-       <*> counting (liftCounting staticMeta name "forge-state-update-error" tr)
-       <*> counting (liftCounting staticMeta name "block-from-future" tr)
-       <*> counting (liftCounting staticMeta name "slot-is-immutable" tr)
-       <*> counting (liftCounting staticMeta name "node-is-leader" tr)
-       <*> counting (liftCounting staticMeta name "adoption-thread-died" tr)
+       <$> counting (liftCounting metaInfo     name "forged"                   tr)
+       <*> counting (liftCounting metaInfo     name "forge-about-to-lead"      tr)
+       <*> counting (liftCounting metaError    name "could-not-forge"          tr)
+       <*> counting (liftCounting metaInfo     name "adopted"                  tr)
+       <*> counting (liftCounting metaError    name "didnt-adopt"              tr)
+       <*> counting (liftCounting metaError    name "forged-invalid"           tr)
+       <*> counting (liftCounting metaInfo     name "node-not-leader"          tr)
+       <*> counting (liftCounting metaError    name "cannot-forge"             tr)
+       <*> counting (liftCounting metaCritical name "forge-state-update-error" tr)
+       <*> counting (liftCounting metaError    name "block-from-future"        tr)
+       <*> counting (liftCounting metaError    name "slot-is-immutable"        tr)
+       <*> counting (liftCounting metaInfo     name "node-is-leader"           tr)
+       <*> counting (liftCounting metaError    name "adoption-thread-died"     tr)
 
    traceServedCount :: Maybe EKGDirect -> TraceChainSyncServerEvent blk -> IO ()
    traceServedCount Nothing _ = pure ()
@@ -1397,21 +1399,25 @@ forgeStateInfoMetricsTraceTransformer p tr = Tracer $
                   $ fromIntegral kesPeriodsUntilExpiry
               ]
 
-        meta <- mkLOMeta Critical Confidential
-        mapM_ (traceNamedObject metricsTr . (meta,)) logValues
+        metaInfo <- mkLOMeta Info Public
+        mapM_ (traceNamedObject metricsTr . (metaInfo,)) logValues
 
         -- Trace warning messages on the last 7 KES periods and, in the
         -- final and subsequent KES periods, trace alert messages.
         metaWarning <- mkLOMeta Warning Public
         metaAlert <- mkLOMeta Alert Public
-        when (kesPeriodsUntilExpiry <= 7) $
-          traceWith tr
-            ( mempty
-            , LogObject
-                mempty
-                (if kesPeriodsUntilExpiry <= 1 then metaAlert else metaWarning)
-                (LogStructuredText mempty (expiryLogMessage kesPeriodsUntilExpiry))
-            )
+        traceWith tr
+          ( mempty
+          , LogObject
+              mempty
+              (if kesPeriodsUntilExpiry > 7
+               then metaInfo
+                else if kesPeriodsUntilExpiry > 1
+                     then metaWarning
+                     else metaAlert
+              )
+              (LogStructuredText mempty (expiryLogMessage kesPeriodsUntilExpiry))
+          )
   where
     expiryLogMessage :: Word -> Text
     expiryLogMessage kesPeriodsUntilExpiry =