Syncing from upstream camptocamp/odoo-cloud-platform (17.0)

attachment_azure/models/ir_attachment.py

@@ -177,8 +177,12 @@ def _store_file_write(self, key, bin_data):
                 try:
                     blob_client.upload_blob(file, blob_type="BlockBlob")
                 except ResourceExistsError:
-                    _logger.exception(
-                        "Trying to re create an existing resource %s" % filename
+                    (
+                        _logger.exception(
+                            "Trying to re create an existing resource %s",
+                            filename,
+                            stack_info=True,
+                        ),
                     )
                 except HttpResponseError as error:
                     # log verbose error from azure, return short message for user

logging_json/json_log.py

@@ -6,8 +6,6 @@
 import threading
 import uuid
 
-import pythonjsonlogger
-
 from odoo import http
 
 from .strtobool import strtobool
@@ -16,20 +14,21 @@
 
 # Module ``jsonlogger`` of package ``python-json-logger`` is deprecated since version
 # 3.1.0, keep it for backward compatibility
-if hasattr(pythonjsonlogger, "json"):
-    jsonlogger = pythonjsonlogger.json
-elif hasattr(pythonjsonlogger, "jsonlogger"):
-    jsonlogger = pythonjsonlogger.jsonlogger
-else:
-    jsonlogger = None  # noqa
-    _logger.debug("Cannot import 'json' or 'jsonlogger' from 'pythonjsonlogger'.")
+try:
+    # python-json-logger>=3.1.0
+    from pythonjsonlogger.json import JsonFormatter as _JsonFormatter
+except ImportError:
+    # python-json-logger<3.1.0
+    from pythonjsonlogger.jsonlogger import (
+        JsonFormatter as _JsonFormatter,
+    )
 
 
 def is_true(strval):
     return bool(strtobool(strval or "0".lower()))
 
 
-class OdooJsonFormatter(jsonlogger.JsonFormatter):
+class OdooJsonFormatter(_JsonFormatter):
     def add_fields(self, log_record, record, message_dict):
         record.pid = os.getpid()
         record.dbname = getattr(threading.current_thread(), "dbname", "?")