debugbundle-python 1.4.0__py3-none-any.whl → 1.4.1__py3-none-any.whl

debugbundle/event_support.py

@@ -264,7 +264,7 @@ def sdk_version() -> str:
     try:
         return metadata.version("debugbundle-python")
     except metadata.PackageNotFoundError:
-        return "1.4.0"
+        return "1.4.1"
 
 
 def sdk_config_endpoint(events_endpoint: str) -> str:

debugbundle/logger_integrations.py

@@ -3,6 +3,8 @@ from __future__ import annotations
 from collections.abc import Callable
 from typing import Any, Protocol
 
+from .structlog_integration import StructlogLoggerProxy as _StructlogLoggerProxy
+
 
 class LogCaptureApi(Protocol):
     def capture_log(
@@ -44,14 +46,18 @@ def _attach_structlog(
         if getattr(original_get_logger, "__debugbundle_structlog_wrapper__", False):
             return None
 
+        active = [True]
+
         def get_logger(*args: Any, **kwargs: Any) -> Any:
-            return _StructlogLoggerProxy(original_get_logger(*args, **kwargs), sdk)
+            return _StructlogLoggerProxy(original_get_logger(*args, **kwargs), sdk, active)
 
         setattr(get_logger, "__debugbundle_structlog_wrapper__", True)
         structlog.get_logger = get_logger
 
         def restore() -> None:
-            structlog.get_logger = original_get_logger
+            active[0] = False
+            if structlog.get_logger is get_logger:
+                structlog.get_logger = original_get_logger
 
         return restore
     except Exception as error:
@@ -100,40 +106,6 @@ def _normalize_level(level: str) -> str:
     return normalized
 
 
-class _StructlogLoggerProxy:
-    def __init__(self, logger: Any, sdk: LogCaptureApi) -> None:
-        self._logger = logger
-        self._sdk = sdk
-
-    def bind(self, *args: Any, **kwargs: Any) -> _StructlogLoggerProxy:
-        return _StructlogLoggerProxy(self._logger.bind(*args, **kwargs), self._sdk)
-
-    def new(self, *args: Any, **kwargs: Any) -> _StructlogLoggerProxy:
-        return _StructlogLoggerProxy(self._logger.new(*args, **kwargs), self._sdk)
-
-    def __getattr__(self, name: str) -> Any:
-        attribute = getattr(self._logger, name)
-        if name not in {
-            "debug",
-            "info",
-            "warning",
-            "warn",
-            "error",
-            "critical",
-            "exception",
-        } or not callable(attribute):
-            return attribute
-
-        def wrapped(event: Any = None, *args: Any, **kwargs: Any) -> Any:
-            context = dict(kwargs)
-            for index, value in enumerate(args):
-                context[f"arg_{index}"] = value
-            self._sdk.capture_log(str(event or ""), level=_normalize_level(name), context=context or None)
-            return attribute(event, *args, **kwargs)
-
-        return wrapped
-
-
 def _emit_diagnostic(
     on_diagnostic: Callable[[dict[str, object]], None] | None,
     error: Exception,
@@ -151,4 +123,4 @@ def _emit_diagnostic(
                 }
             },
         }
-    )
+    )

debugbundle/structlog_integration.py

@@ -0,0 +1,136 @@
+from __future__ import annotations
+
+import copy
+import inspect
+import logging
+from contextvars import ContextVar
+from typing import Any
+
+_CAPTURING: ContextVar[bool] = ContextVar("debugbundle_structlog_capture", default=False)
+_LOG_METHODS = {"debug", "info", "warning", "warn", "error", "critical", "fatal", "exception", "log"}
+_BIND_METHODS = {"bind", "new", "unbind", "try_unbind"}
+
+
+def _capture(sdk: Any, active: list[bool], name: str, record: dict[str, Any]) -> None:
+    if not active[0] or _CAPTURING.get():
+        return
+    token = _CAPTURING.set(True)
+    try:
+        context = dict(record)
+        message = str(context.pop("event", ""))
+        level = {"warn": "warning", "exception": "error", "fatal": "critical"}.get(name, name)
+        sdk.capture_log(message, level=level, context=context or None)
+    except Exception:
+        # A logger adapter must not throw into the application's logging path.
+        pass
+    finally:
+        _CAPTURING.reset(token)
+
+
+class _SinkProxy:
+    def __init__(self, sink: Any, sdk: Any, active: list[bool], record: dict[str, Any]) -> None:
+        self._sink = sink
+        self._sdk = sdk
+        self._active = active
+        self._record = record
+
+    def __getattr__(self, name: str) -> Any:
+        method = getattr(self._sink, name)
+        if name not in _LOG_METHODS or not callable(method):
+            return method
+
+        def emit(*args: Any, **kwargs: Any) -> Any:
+            result = method(*args, **kwargs)
+            # stdlib records go through the existing SDK logging.Handler, after
+            # Logger.disabled, logging.disable(), levels and logger filters.
+            if not isinstance(self._sink, (logging.Logger, logging.LoggerAdapter)):
+                _capture(self._sdk, self._active, name, self._record)
+            return result
+
+        return emit
+
+
+class StructlogLoggerProxy:
+    def __init__(self, logger: Any, sdk: Any, active: list[bool] | None = None) -> None:
+        self._logger = logger
+        self._sdk = sdk
+        self._active = active if active is not None else [True]
+
+    def __getattr__(self, name: str) -> Any:
+        attribute = getattr(self._logger, name)
+        if not callable(attribute):
+            return attribute
+        if name in _BIND_METHODS:
+            def bind(*args: Any, **kwargs: Any) -> StructlogLoggerProxy:
+                return StructlogLoggerProxy(attribute(*args, **kwargs), self._sdk, self._active)
+            return bind
+        method_name = name[1:] if name.startswith("a") else name
+        if method_name not in _LOG_METHODS:
+            return attribute
+
+        def prepare(args: tuple[Any, ...], kwargs: dict[str, Any]) -> Any:
+            if not self._active[0] or _CAPTURING.get():
+                return attribute
+            try:
+                bound = self._logger.bind() if hasattr(self._logger, "bind") else self._logger
+                if not hasattr(bound, "_processors") or not hasattr(bound, "_logger"):
+                    return self._legacy_method(attribute, method_name)
+                # Keep the application's bound logger and processor list intact.
+                # The per-call clone also isolates concurrent/async log records.
+                clone = copy.copy(bound)
+                self._ensure_stdlib_handler(bound._logger)
+                record = dict(bound._context)
+                record.update(kwargs)
+                if args:
+                    record["event"] = args[1] if method_name == "log" and len(args) > 1 else args[0]
+                processors = list(bound._processors)
+                if processors:
+                    last = processors[-1]
+
+                    def observe(logger: Any, level: str, event: Any) -> Any:
+                        result = last(logger, level, event)
+                        snapshot = result if isinstance(result, dict) else event
+                        if isinstance(snapshot, dict):
+                            record.clear()
+                            record.update(snapshot)
+                        return result
+
+                    processors[-1] = observe
+                clone._processors = processors
+                clone._logger = _SinkProxy(bound._logger, self._sdk, self._active, record)
+                return getattr(clone, name)
+            except Exception:
+                # Preparation can fail for a custom logger; call it exactly once.
+                return attribute
+
+        if inspect.iscoroutinefunction(attribute):
+            async def async_log(*args: Any, **kwargs: Any) -> Any:
+                return await prepare(args, kwargs)(*args, **kwargs)
+            return async_log
+
+        def log(*args: Any, **kwargs: Any) -> Any:
+            return prepare(args, kwargs)(*args, **kwargs)
+        return log
+
+    def _ensure_stdlib_handler(self, sink: Any) -> None:
+        logger = sink.logger if isinstance(sink, logging.LoggerAdapter) else sink
+        if not isinstance(logger, logging.Logger):
+            return
+        current: logging.Logger | None = logger
+        while current is not None:
+            if any(getattr(handler, "_sdk", None) is self._sdk for handler in current.handlers):
+                return
+            if not current.propagate:
+                break
+            current = current.parent
+        attach = getattr(self._sdk, "capture_logging", None)
+        if callable(attach):
+            attach(logger=logger)
+
+    def _legacy_method(self, attribute: Any, name: str) -> Any:
+        def log(event: Any = None, *args: Any, **kwargs: Any) -> Any:
+            result = attribute(event, *args, **kwargs)
+            record = {**kwargs, **{f"arg_{i}": value for i, value in enumerate(args)}, "event": event or ""}
+            _capture(self._sdk, self._active, name, record)
+            return result
+        return log

{debugbundle_python-1.4.0.dist-info → debugbundle_python-1.4.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: debugbundle-python
-Version: 1.4.0
+Version: 1.4.1
 Summary: DebugBundle SDK for Python
 Author: DebugBundle
 License-Expression: Apache-2.0
@@ -49,6 +49,10 @@ Use this package to capture Python backend exceptions, request metadata, structu
 
 Requires Python 3.10 or newer.
 
+## Automatic capture and application filtering
+
+`capture_logging()` attaches the stdlib logging handler and detects installed structlog/loguru integrations. Obtain structlog loggers after attachment. Structlog level filters and `DropEvent` processors run before capture; stdlib-backed structlog loggers also honor logger filters, disabled state and `logging.disable()`. Bound context and async logging are supported. SDK disposal stops capture through cached proxies. DebugBundle has its own minimum capture level; destination-specific filters on other handlers or Loguru sinks do not configure the DebugBundle handler.
+
 ## Installation
 
 ```bash

{debugbundle_python-1.4.0.dist-info → debugbundle_python-1.4.1.dist-info}/RECORD

@@ -3,12 +3,13 @@ debugbundle/acknowledgement.py,sha256=tyI8XLRG9N3-Weo6uiGrAlf_O4tjptVe1x1cG7RjrM
 debugbundle/before_send.py,sha256=_tmV6ovHUBIxfQPMQ8a0C6r91IAnd4DVs8UcjsKhqX0,7792
 debugbundle/config.py,sha256=ENRSR5jUI7xYdBqUakWws3GIjBk00GWFmwXVE_iQp2Y,9296
 debugbundle/core.py,sha256=ox4fNADe2kRic9aUePB_RJmT81vCQ9SFW6PaCSL-YL0,32888
-debugbundle/event_support.py,sha256=hg_GFyj_9nesQ5oOzvW-TmHI6R2E-6WGHsBp-MhYBOQ,9046
-debugbundle/logger_integrations.py,sha256=RuTNaD9RRVmiE-BBkksAXWVEGaMzLrWavVpQdgGZBpE,4564
+debugbundle/event_support.py,sha256=vSiD8HoMPSKnXIlc-S5ZtnGllH9al79nLc04RX-eywY,9046
+debugbundle/logger_integrations.py,sha256=T6LR10_DgDS8C-CUPxtC1kZz3qfX5j0B2YUV7LxDovk,3572
 debugbundle/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 debugbundle/redaction.py,sha256=QTaPkSsYv54yR1mz8SB6Q4vWjvp7Ddcui4WXaH2RVz8,736
 debugbundle/relay.py,sha256=p5-tFXsgH8TZfB7Va3C2XFJsi8mYOMnGjr01W_kApME,14366
 debugbundle/relay_delivery.py,sha256=VL-nIgJR6mYXqKy-EbA0USWeY_iS_uAr1KBzrnwBnnk,4676
+debugbundle/structlog_integration.py,sha256=fIrv5U2TrbYURsEt_Bne-JuW3xLdgpNyM3RyBNp7RyU,5794
 debugbundle/suppression.py,sha256=XMn0GfF_-WZk2wHWk3KfbO5_u5QhEunues5h3jOInLs,4098
 debugbundle/transport.py,sha256=V289FwFWL6KV5gyzOsesluEMbpRobm_FHu3x8BpOYKU,2014
 debugbundle/trigger_token.py,sha256=YUwIWnnxu1klAVaB8Ltgk_PwWW_PPjq9rzmEbWXeFeM,4455
@@ -20,8 +21,8 @@ debugbundle/integrations/flask.py,sha256=cgyHbsAH96gpNPf_5IGJYzp2va28JdDgXROBsF-
 debugbundle/integrations/relay_django.py,sha256=Wj8BE9D5otU2KmtjgqdKIJ-BvXVcagCKgpLYvnPZ6WE,2281
 debugbundle/integrations/relay_fastapi.py,sha256=-Zl6bvhYMLii__mP6-UvSdwxS5VKsb9OZvk-yy-3hEw,2227
 debugbundle/integrations/relay_flask.py,sha256=VFHkDTJy4LkZzL_Ry_Ba-e_gW6UTG4PBwnLcvB_oXuQ,2011
-debugbundle_python-1.4.0.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-debugbundle_python-1.4.0.dist-info/METADATA,sha256=aFboU5dUpifzAC0Hl3boTfOanvIenWq6IBN9n0Zuavw,13831
-debugbundle_python-1.4.0.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
-debugbundle_python-1.4.0.dist-info/top_level.txt,sha256=RCB9STTFnl1OKdojxz-xhaks2zkRFs1meZXsKnm18LM,12
-debugbundle_python-1.4.0.dist-info/RECORD,,
+debugbundle_python-1.4.1.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+debugbundle_python-1.4.1.dist-info/METADATA,sha256=565SQt1hHG6Unoj5Cj7Pa60AsMgs097_XnQSg7VnxuI,14452
+debugbundle_python-1.4.1.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
+debugbundle_python-1.4.1.dist-info/top_level.txt,sha256=RCB9STTFnl1OKdojxz-xhaks2zkRFs1meZXsKnm18LM,12
+debugbundle_python-1.4.1.dist-info/RECORD,,