Merge pull request #6919 from chaen/v8.0_FIX_jsonLog

[8.0] Log fixes for stdoutJson and MicrosecondjsonFormatter (MQ logs and stdoutjson)

Author: chrisburr

src/DIRAC/FrameworkSystem/private/standardLogging/Formatter/MicrosecondJsonFormatter.py

@@ -1,10 +1,26 @@
 import time
-from pythonjsonlogger.jsonlogger import JsonFormatter
+from pythonjsonlogger.jsonlogger import JsonFormatter, RESERVED_ATTRS
 
 
 class MicrosecondJsonFormatter(JsonFormatter):
     """Standard JSON formater with microsecond precision"""
 
+    def __init__(self, *args, **kwargs):
+        """
+        Add to the list of attributes we don't want to see
+        all the DIRAC spefic log formating instructions
+        """
+        if "reserved_attrs" not in kwargs:
+            kwargs["reserved_attrs"] = RESERVED_ATTRS + (
+                "spacer",
+                "headerIsShown",
+                "timeStampIsShown",
+                "contextIsShown",
+                "threadIDIsShown",
+                "color",
+            )
+        super().__init__(*args, **kwargs)
+
     def formatTime(self, record, datefmt=None):
         """:py:meth:`logging.Formatter.formatTime` with microsecond precision by default"""
         ct = self.converter(record.created)

src/DIRAC/Resources/LogBackends/StdoutJsonBackend.py

@@ -8,12 +8,24 @@
 from DIRAC.FrameworkSystem.private.standardLogging.Formatter.MicrosecondJsonFormatter import MicrosecondJsonFormatter
 
 
+# These are the standard logging fields that we want to see
+# in the json. All the non default are printed anyway
+DEFAULT_FMT = "%(levelname)s %(message)s %(asctime)s"
+
+
 class StdoutJsonBackend(AbstractBackend):
     """
     This just spits out the log on stdout in a json format.
     """
 
     def __init__(self, backendParams=None, backendFilters=None):
+        # The `Format` parameter is passed as `fmt` to MicrosecondJsonFormatter
+        # which uses it to know which "standard" fields to keep in the
+        # json output. So we need these
+        if not backendParams:
+            backendParams = {}
+        backendParams.setdefault("Format", DEFAULT_FMT)
+
         super().__init__(logging.StreamHandler, MicrosecondJsonFormatter, backendParams, backendFilters)
 
     def _setHandlerParameters(self, backendParams=None):