mh_structlog 0.0.44__tar.gz → 0.0.45__tar.gz

{mh_structlog-0.0.44 → mh_structlog-0.0.45}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: mh_structlog
-Version: 0.0.44
+Version: 0.0.45
 Summary: Some Structlog configuration and wrappers to easily use structlog.
 Author: Mathieu Hinderyckx
 Author-email: Mathieu Hinderyckx <mathieu.hinderyckx@gmail.com>

{mh_structlog-0.0.44 → mh_structlog-0.0.45}/pyproject.toml

@@ -8,7 +8,7 @@ authors = [
     { name = "Mathieu Hinderyckx", email = "mathieu.hinderyckx@gmail.com" },
 ]
 description = "Some Structlog configuration and wrappers to easily use structlog."
-version = "0.0.44"
+version = "0.0.45"
 readme = "README.md"
 requires-python = ">=3.10"
 classifiers = [

{mh_structlog-0.0.44 → mh_structlog-0.0.45}/src/mh_structlog/config.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 import logging  # noqa: I001
 import logging.config
+import os
 import sys
 from pathlib import Path
 from typing import Literal
@@ -31,6 +32,7 @@ def setup(  # noqa: PLR0912, PLR0915, C901
     max_frames: int = 100,
     sentry_config: dict | None = None,
     additional_processors: list | None = None,  # noqa: FBT001, FBT002
+    timestamp_ms_precision: bool | None = True,
 ) -> None:
     """This method configures structlog and the standard library logging module."""
     global SELECTED_LOG_FORMAT  # noqa: PLW0603
@@ -50,6 +52,9 @@ def setup(  # noqa: PLR0912, PLR0915, C901
         structlog.contextvars.merge_contextvars,  # add variables and bound data from global context
     ]
 
+    if timestamp_ms_precision:
+        shared_processors.append(processors.cap_timestamp_to_ms_precision)
+
     if additional_processors:
         shared_processors.extend(additional_processors)
 
@@ -99,8 +104,33 @@ def setup(  # noqa: PLR0912, PLR0915, C901
         )
 
     wrapper_class = structlog.stdlib.BoundLogger
+
+    env_log_level_str = os.environ.get('LOG_LEVEL', '').upper()
+    env_log_level_constant = logging._nameToLevel.get(env_log_level_str)  # noqa: SLF001
+
+    if env_log_level_str and not env_log_level_constant:
+        raise StructlogLoggingConfigExceptionError(
+            f"LOG_LEVEL environment variable has unrecognized value: {env_log_level_str}"
+        )
+
     if global_filter_level is not None:
+        if global_filter_level not in logging._nameToLevel.values():  # noqa: SLF001
+            raise StructlogLoggingConfigExceptionError(
+                f"global_filter_level has unrecognized value: {global_filter_level}"
+            )
+        if env_log_level_constant and env_log_level_constant != global_filter_level:
+            from logging import getLogger  # noqa: PLC0415
+
+            getLogger('mh_structlog').warning(
+                'Both global_filter_level (%s, %s) and LOG_LEVEL environment variable (%s, %s) are set, but they differ. global_filter_level takes precedence.',
+                global_filter_level,
+                logging.getLevelName(global_filter_level),
+                env_log_level_constant,
+                logging.getLevelName(env_log_level_constant),
+            )
         wrapper_class = structlog.make_filtering_bound_logger(global_filter_level)
+    elif env_log_level_constant:
+        wrapper_class = structlog.make_filtering_bound_logger(env_log_level_constant)  # noqa: SLF001
 
     # Structlog configuration
     structlog.configure(

{mh_structlog-0.0.44 → mh_structlog-0.0.45}/src/mh_structlog/processors.py

@@ -95,3 +95,10 @@ class CapExceptionFrames:
         if self.max_frames is not None and 'exception' in event_dict and 'frames' in event_dict["exception"]:
             event_dict['exception']['frames'] = event_dict['exception']['frames'][-self.max_frames :]
         return event_dict
+
+
+def cap_timestamp_to_ms_precision(_, __, event_dict: dict) -> dict:  # noqa: ANN001
+    """Cap the timestamp to millisecond precision, dropping the microseconds part."""
+    if ts := event_dict.get("timestamp"):
+        event_dict['timestamp'] = ts[:-4] + 'Z'
+    return event_dict