Merge pull request #8681 from fstagni/fix_concatenate_v90

[9.0] fix: concatenate list to list

Author: fstagni

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

@@ -15,14 +15,14 @@ def __init__(self, *args, **kwargs):
         self.converter = time.gmtime
 
         if "reserved_attrs" not in kwargs:
-            kwargs["reserved_attrs"] = RESERVED_ATTRS + (
+            kwargs["reserved_attrs"] = list(RESERVED_ATTRS) + [
                 "spacer",
                 "headerIsShown",
                 "timeStampIsShown",
                 "contextIsShown",
                 "threadIDIsShown",
                 "color",
-            )
+            ]
         super().__init__(*args, **kwargs)
 
     def formatTime(self, record, datefmt=None):

src/DIRAC/FrameworkSystem/private/standardLogging/test/Test_MicrosecondJsonFormatter.py

@@ -0,0 +1,83 @@
+"""
+Test MicrosecondJsonFormatter
+"""
+
+import logging
+
+from DIRAC.FrameworkSystem.private.standardLogging.Formatter.MicrosecondJsonFormatter import MicrosecondJsonFormatter
+
+
+DIRAC_CUSTOM_ATTRS = [
+    "spacer",
+    "headerIsShown",
+    "timeStampIsShown",
+    "contextIsShown",
+    "threadIDIsShown",
+    "color",
+]
+
+
+def test_init_with_tuple_reserved_attrs():
+    """Test that MicrosecondJsonFormatter works when RESERVED_ATTRS is a tuple (python-json-logger v2.x)"""
+    from pythonjsonlogger import jsonlogger
+
+    original = jsonlogger.RESERVED_ATTRS
+    try:
+        jsonlogger.RESERVED_ATTRS = ("args", "asctime", "created")
+        formatter = MicrosecondJsonFormatter()
+        assert isinstance(formatter.reserved_attrs, set)
+        for attr in DIRAC_CUSTOM_ATTRS:
+            assert attr in formatter.reserved_attrs
+    finally:
+        jsonlogger.RESERVED_ATTRS = original
+
+
+def test_init_with_list_reserved_attrs():
+    """Test that MicrosecondJsonFormatter works when RESERVED_ATTRS is a list (python-json-logger v3.x+)"""
+    from pythonjsonlogger import jsonlogger
+
+    original = jsonlogger.RESERVED_ATTRS
+    try:
+        jsonlogger.RESERVED_ATTRS = ["args", "asctime", "created"]
+        formatter = MicrosecondJsonFormatter()
+        assert isinstance(formatter.reserved_attrs, set)
+        for attr in DIRAC_CUSTOM_ATTRS:
+            assert attr in formatter.reserved_attrs
+    finally:
+        jsonlogger.RESERVED_ATTRS = original
+
+
+def test_formatTime_microsecond_precision():
+    """Test that formatTime produces microsecond precision timestamps"""
+    formatter = MicrosecondJsonFormatter()
+    record = logging.LogRecord(
+        name="test",
+        level=logging.INFO,
+        pathname="test.py",
+        lineno=1,
+        msg="test message",
+        args=(),
+        exc_info=None,
+    )
+    record.created = 1700000000.123456
+
+    result = formatter.formatTime(record)
+    assert result.endswith(",123456Z")
+
+
+def test_formatTime_custom_datefmt():
+    """Test that formatTime respects custom datefmt"""
+    formatter = MicrosecondJsonFormatter()
+    record = logging.LogRecord(
+        name="test",
+        level=logging.INFO,
+        pathname="test.py",
+        lineno=1,
+        msg="test message",
+        args=(),
+        exc_info=None,
+    )
+    record.created = 1700000000.0
+
+    result = formatter.formatTime(record, datefmt="%Y/%m/%d")
+    assert "/" in result