Merge branch 'main' into feature/add-uid-to-ps-everywhere

Author: itayfoT

pyproject.toml

@@ -31,7 +31,7 @@ dependencies = [
   "numpy>=2.2.0,<2.3.0",
   "nska-deserialize>=1.5.0,<1.6.0",
   "yara-python>=4.5.0,<4.6.0",
-  "python-json-logger>=3.3.0,<3.4.0",
+  "python-json-logger>=3.3.0,<4.1.0",
   "python-magic>=0.4.0,<0.5.0",
   "jinja2>=3.1.0,<3.2.0",
   "matplotlib>=3.10.0,<3.11.0",

src/sysdiagnose/utils/logger.py

@@ -1,13 +1,13 @@
 import logging
-from pythonjsonlogger import jsonlogger
+from pythonjsonlogger import json
 from datetime import datetime
 
 logger = logging.getLogger('sysdiagnose')
 # By default, we want to have the possibility to log everything.
 logger.setLevel(logging.DEBUG)
 
 
-class SysdiagnoseJsonFormatter(jsonlogger.JsonFormatter):
+class SysdiagnoseJsonFormatter(json.JsonFormatter):
     '''Custom JSON logger formatter '''
     # https://stackoverflow.com/questions/50873446/python-logger-output-dates-in-is8601-format
     def formatTime(self, record, datefmt=None):