trace-dispatcher: seperate routing of metrics

trace-dispatcher/src/Cardano/Logging/DocuGenerator.hs

@@ -127,6 +127,17 @@ docIt :: MonadIO m
   => BackendConfig
   -> (LoggingContext, Either TraceControl a)
   -> m ()
+docIt EKGBackend (LoggingContext{},
+  Left (Document idx mdText mdMetrics (DocCollector docRef))) = do
+    liftIO $ modifyIORef docRef (\ docMap ->
+        Map.insert
+          idx
+          ((\e -> e { ldBackends  = EKGBackend : ldBackends e
+                    })
+            (case Map.lookup idx docMap of
+                          Just e  -> e
+                          Nothing -> seq mdText (seq mdMetrics (emptyLogDoc mdText mdMetrics))))
+          docMap)
 docIt backend (LoggingContext {..},
   Left (Document idx mdText mdMetrics (DocCollector docRef))) = do
     liftIO $ modifyIORef docRef (\ docMap ->

trace-dispatcher/src/Cardano/Logging/Formatter.hs

@@ -89,8 +89,8 @@ forwardFormatter application (Trace tr) = do
           T.traceWith tr ( nlc
                          , Right (FormattedForwarder to))
         (lc, Left ctrl) -> do
-          T.traceWith tr ( lc
-                         , Left ctrl)
+          T.traceWith tr (lc { lcNamespace = application : lcNamespace lc}
+                            , Left ctrl)
 
 -- | Format this trace for human readability
 -- The boolean value tells, if this representation is for the console and should be colored

trace-dispatcher/src/Cardano/Logging/Tracer/Composed.hs

@@ -77,10 +77,19 @@ mkCardanoTracer' :: forall evt evt1.
   -> IO (Trace IO evt)
 mkCardanoTracer' trStdout trForward mbTrEkg name namesFor severityFor privacyFor
   hook = do
-    tr    <- withBackendsFromConfig backendsAndFormat
-    tr'   <- withLimitersFromConfig (NT.contramap Message tr) (NT.contramap Limit tr)
-    tr''  <- hook tr'
-    addContextAndFilter tr''
+    messageTrace   <- withBackendsFromConfig backendsAndFormat
+    messageTrace'  <- withLimitersFromConfig
+                          (NT.contramap Message messageTrace)
+                          (NT.contramap Limit messageTrace)
+    messageTrace'' <- hook messageTrace'
+    messageTrace''' <- addContextAndFilter messageTrace''
+    let metricsTrace = case mbTrEkg of
+                          Nothing -> Trace NT.nullTracer
+                          Just ekgTrace -> metricsFormatter "Cardano" ekgTrace
+    let metricsTrace' = filterTrace (\(_,v) -> asMetrics v /= []) metricsTrace
+    metricsTrace'' <- hook metricsTrace'
+    pure $ messageTrace''' <> metricsTrace''
+
   where
     addContextAndFilter :: Trace IO evt -> IO (Trace IO evt)
     addContextAndFilter tr = do
@@ -102,13 +111,6 @@ mkCardanoTracer' trStdout trForward mbTrEkg name namesFor severityFor privacyFor
                       [EKGBackend, Forwarder, Stdout HumanFormatColoured]
                       mbBackends
       in do
-        mbEkgTrace     <- case mbTrEkg of
-                            Nothing -> pure Nothing
-                            Just ekgTrace ->
-                              if EKGBackend `elem` backends'
-                                then pure $ Just
-                                      (metricsFormatter "Cardano" ekgTrace)
-                                else pure Nothing
         mbForwardTrace <- if Forwarder `elem` backends'
                             then fmap (Just . filterTraceByPrivacy (Just Public))
                                   (forwardFormatter "Cardano" trForward)
@@ -123,9 +125,9 @@ mkCardanoTracer' trStdout trForward mbTrEkg name namesFor severityFor privacyFor
                                 then fmap Just
                                   (machineFormatter "Cardano" trStdout)
                                 else pure Nothing
-        case mbEkgTrace <> mbForwardTrace <> mbStdoutTrace of
+        case mbForwardTrace <> mbStdoutTrace of
           Nothing -> pure $ Trace NT.nullTracer
-          Just tr -> pure (preFormatted backends' tr)
+          Just tr -> pure $ preFormatted backends' tr
 
 -- A simple dataPointTracer which supports building a namespace.
 mkDataPointTracer :: forall dp. ToJSON dp

trace-dispatcher/test/Cardano/Logging/Test/Oracles.hs

@@ -36,7 +36,6 @@ oracleMessages conf ScriptRes {..} =
                       && privacyForMessage msg == Public
           isCorrectForwarder = includedExactlyOnce msg srForwardRes == inForwarder
           inEKG = elem EKGBackend backends
-                      && fromEnum (severityForMessage msg) >= fromEnum filterSeverity
                       && not (null (asMetrics msg))
           isCorrectEKG = includedExactlyOnce msg srEkgRes == inEKG
           res = isCorrectStdout && isCorrectForwarder && isCorrectEKG