fix: prevent duplicate keys in stdlib log messages (#9)

litestar-org · Dec 17, 2024 · 0ddfac4 · 0ddfac4
1 parent 9211187
commit 0ddfac4
Show file tree

Hide file tree

Showing 5 changed files with 435 additions and 387 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -11,7 +11,7 @@ repos:
       - id: mixed-line-ending
       - id: trailing-whitespace
   - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: v0.8.2
+    rev: v0.8.3
     hooks:
       - id: ruff
         args:

diff --git a/app/config.py b/app/config.py
@@ -93,21 +93,25 @@ def _is_tty() -> bool:
 
 
 _render_as_json = not _is_tty()
-_structlog_processors = default_structlog_processors(as_json=_render_as_json)
+_structlog_default_processors = default_structlog_processors(as_json=_render_as_json)
+_structlog_default_processors.insert(1, structlog.processors.EventRenamer("message"))
+_structlog_standard_lib_processors = default_structlog_standard_lib_processors(as_json=_render_as_json)
+_structlog_standard_lib_processors.insert(1, structlog.processors.EventRenamer("message"))
+
 if settings.app.OPENTELEMETRY_ENABLED:
-    _structlog_processors.insert(-1, logfire.StructlogProcessor())
+    _structlog_default_processors.insert(-1, logfire.StructlogProcessor())
 log = StructlogConfig(
     enable_middleware_logging=False,
     structlog_logging_config=StructLoggingConfig(
         log_exceptions="always",
-        processors=_structlog_processors,
+        processors=_structlog_default_processors,
         logger_factory=default_logger_factory(as_json=_render_as_json),
         standard_lib_logging_config=LoggingConfig(
             root={"level": logging.getLevelName(settings.log.LEVEL), "handlers": ["queue_listener"]},
             formatters={
                 "standard": {
                     "()": structlog.stdlib.ProcessorFormatter,
-                    "processors": default_structlog_standard_lib_processors(as_json=_render_as_json),
+                    "processors": _structlog_standard_lib_processors,
                 },
             },
             loggers={