Trace-dispatcher: Fixes

IntersectMBO · Nov 25, 2021 · 3d55de1 · 3d55de1
1 parent be302f2
commit 3d55de1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/trace-dispatcher/src/Cardano/Logging/Formatter.hs b/trace-dispatcher/src/Cardano/Logging/Formatter.hs
@@ -211,10 +211,13 @@ formatContextMachine hostname application LoggingContext {..} obj = do
   let severity = (pack . show) (fromMaybe Info lcSeverity)
       tid      = fromMaybe ((pack . show) thid)
                     ((stripPrefix "ThreadId " . pack . show) thid)
-      ns       = application : lcNamespace
+      ns       = fromString hostname
+                    <> singleton ':'
+                    <> mconcat (intersperse (singleton '.')
+                        (map fromText (application : lcNamespace)))
       ts       = pack $ formatTime defaultTimeLocale "%F %H:%M:%S%4Q" time
   pure $ AE.pairs $    "at"      .= ts
-                    <> "ns"      .= ns
+                    <> "ns"      .= toStrict (toLazyText ns)
                     <> "message" .= obj
                     <> "sev"     .= severity
                     <> "thread"  .= tid

diff --git a/trace-dispatcher/src/Cardano/Logging/Tracer/Forward.hs b/trace-dispatcher/src/Cardano/Logging/Tracer/Forward.hs
@@ -1,8 +1,6 @@
 {-# LANGUAGE DataKinds           #-}
 {-# LANGUAGE FlexibleInstances   #-}
-{-# LANGUAGE NamedFieldPuns      #-}
 {-# LANGUAGE OverloadedStrings   #-}
-{-# LANGUAGE PackageImports      #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 
 module Cardano.Logging.Tracer.Forward