simplified log kwargs

Author: pcrespov

packages/service-library/src/servicelib/aiohttp/rest_middlewares.py

@@ -13,10 +13,9 @@
 from aiohttp.web_request import Request
 from aiohttp.web_response import StreamResponse
 from models_library.error_codes import create_error_code
-from models_library.errors_classes import OsparcErrorMixin
 from models_library.utils.json_serialization import json_dumps
 
-from ..logging_errors import create_troubleshotting_log_message, get_log_record_extra
+from ..logging_errors import create_troubleshotting_log_kwargs
 from ..mimetype_constants import MIMETYPE_APPLICATION_JSON
 from ..utils import is_production_environ
 from .rest_models import ErrorItemType, ErrorType, LogMessageType
@@ -59,31 +58,22 @@ def _process_and_raise_unexpected_error(request: web.BaseRequest, err: Exception
             "request.method": f"{request.method}",
             "request.path": f"{request.path}",
         }
-        if isinstance(err, OsparcErrorMixin):
-            error_context.update(err.error_context())
 
         frontend_msg = _FMSG_INTERNAL_ERROR_USER_FRIENDLY_WITH_OEC.format(
             error_code=error_code
         )
-        log_msg = create_troubleshotting_log_message(
-            message_to_user=frontend_msg,
-            exception=err,
-            error_code=error_code,
-            error_context=error_context,
-        )
-
         http_error = create_http_error(
             err,
             frontend_msg,
             web.HTTPInternalServerError,
             skip_internal_error_details=_is_prod,
         )
         _logger.exception(
-            log_msg,
-            extra=get_log_record_extra(
-                error_code=error_code,
-                user_id=error_context.get("user_id"),
-            ),
+            **create_troubleshotting_log_kwargs(
+                message_to_user=frontend_msg,
+                exception=err,
+                error_context=error_context,
+            )
         )
         raise http_error
 

packages/service-library/tests/test_logging_errors.py

@@ -9,7 +9,6 @@
     create_troubleshotting_log_kwargs,
     create_troubleshotting_log_message,
 )
-from servicelib.logging_utils import get_log_record_extra
 
 
 def test_create_troubleshotting_log_message(caplog: pytest.LogCaptureFixture):
@@ -41,12 +40,13 @@ class MyError(OsparcErrorMixin, RuntimeError):
     )
 
     assert log_kwargs["msg"] == log_msg
+    assert (
+        log_kwargs["extra"]["log_uid"] == "123"
+    ), "user_id is injected as extra from context"
 
     with caplog.at_level(logging.WARNING):
         root_logger = logging.getLogger()
-        root_logger.exception(
-            log_msg, extra=get_log_record_extra(error_code=error_code)
-        )
+        root_logger.exception(**log_kwargs)
 
         # ERROR    root:test_logging_utils.py:417 Nice message to user [OEC:126055703573984].
         # {