feat: refactored debug logging (#59)

Author: mitsuhiko

sentry_sdk/__init__.py

@@ -22,14 +22,14 @@
     except Exception as e:
         sentry_sdk.capture_exception(e)
 """
-from .api import *  # noqa
-from .api import __all__  # noqa
+from sentry_sdk.api import *  # noqa
+from sentry_sdk.api import __all__  # noqa
 
 # modules we consider public
 __all__.append("integrations")
 
 # Initialize the debug support after everything is loaded
-from .debug import init_debug_support
+from sentry_sdk.debug import init_debug_support
 
 init_debug_support()
 del init_debug_support

sentry_sdk/api.py

@@ -1,12 +1,12 @@
 import inspect
 from contextlib import contextmanager
 
-from .hub import Hub
-from .scope import Scope
-from .utils import EventHint
-from .transport import Transport, HttpTransport
-from .client import Client, get_options
-from .integrations import setup_integrations
+from sentry_sdk.hub import Hub
+from sentry_sdk.scope import Scope
+from sentry_sdk.utils import EventHint
+from sentry_sdk.transport import Transport, HttpTransport
+from sentry_sdk.client import Client, get_options
+from sentry_sdk.integrations import setup_integrations
 
 
 __all__ = ["Hub", "Scope", "Client", "EventHint", "Transport", "HttpTransport"]

sentry_sdk/client.py

@@ -3,17 +3,17 @@
 import random
 from datetime import datetime
 
-from ._compat import string_types
-from .utils import (
+from sentry_sdk._compat import string_types
+from sentry_sdk.utils import (
     strip_event,
     flatten_metadata,
     convert_types,
     handle_in_app,
     get_type_name,
     logger,
 )
-from .transport import make_transport
-from .consts import DEFAULT_OPTIONS, SDK_INFO
+from sentry_sdk.transport import make_transport
+from sentry_sdk.consts import DEFAULT_OPTIONS, SDK_INFO
 
 
 def get_options(*args, **kwargs):

sentry_sdk/debug.py

@@ -1,8 +1,9 @@
 import sys
 import logging
 
-from .hub import Hub
-from .utils import logger
+from sentry_sdk import utils
+from sentry_sdk.hub import Hub
+from sentry_sdk.utils import logger
 
 
 class _HubBasedClientFilter(logging.Filter):
@@ -14,10 +15,21 @@ def filter(self, record):
 
 
 def init_debug_support():
-    if logger.handlers:
-        return
+    if not logger.handlers:
+        configure_logger()
+    configure_debug_hub()
+
+
+def configure_logger():
     _handler = logging.StreamHandler(sys.stderr)
     _handler.setFormatter(logging.Formatter(" [sentry] %(levelname)s: %(message)s"))
     logger.addHandler(_handler)
     logger.setLevel(logging.DEBUG)
     logger.addFilter(_HubBasedClientFilter())
+
+
+def configure_debug_hub():
+    def _get_debug_hub():
+        return Hub.current
+
+    utils._get_debug_hub = _get_debug_hub

sentry_sdk/hub.py

@@ -3,24 +3,19 @@
 from datetime import datetime
 from contextlib import contextmanager
 
-from ._compat import with_metaclass
-from .scope import Scope
-from .utils import exc_info_from_error, event_from_exception, logger, ContextVar
+from sentry_sdk._compat import with_metaclass
+from sentry_sdk.scope import Scope
+from sentry_sdk.utils import (
+    exc_info_from_error,
+    event_from_exception,
+    logger,
+    ContextVar,
+)
 
 
 _local = ContextVar("sentry_current_hub")
 
 
-@contextmanager
-def _internal_exceptions():
-    try:
-        yield
-    except Exception:
-        hub = Hub.current
-        if hub:
-            hub._capture_internal_exception(sys.exc_info())
-
-
 def _get_client_options():
     hub = Hub.current
     if hub and hub.client:

sentry_sdk/integrations/__init__.py

@@ -1,8 +1,8 @@
 """This package"""
 from threading import Lock
 
-from ..utils import logger
-from ..consts import INTEGRATIONS as _installed_integrations
+from sentry_sdk.utils import logger
+from sentry_sdk.consts import INTEGRATIONS as _installed_integrations
 
 
 _installer_lock = Lock()
@@ -18,11 +18,11 @@ def get_default_integrations():
     - `DedupeIntegration`
     - `AtexitIntegration`
     """
-    from .logging import LoggingIntegration
-    from .stdlib import StdlibIntegration
-    from .excepthook import ExcepthookIntegration
-    from .dedupe import DedupeIntegration
-    from .atexit import AtexitIntegration
+    from sentry_sdk.integrations.logging import LoggingIntegration
+    from sentry_sdk.integrations.stdlib import StdlibIntegration
+    from sentry_sdk.integrations.excepthook import ExcepthookIntegration
+    from sentry_sdk.integrations.dedupe import DedupeIntegration
+    from sentry_sdk.integrations.atexit import AtexitIntegration
 
     yield LoggingIntegration()
     yield StdlibIntegration()

sentry_sdk/integrations/_wsgi.py

@@ -2,13 +2,8 @@
 import sys
 
 from sentry_sdk import capture_exception
-from sentry_sdk.hub import (
-    Hub,
-    _internal_exceptions,
-    _should_send_default_pii,
-    _get_client_options,
-)
-from sentry_sdk.utils import AnnotatedValue
+from sentry_sdk.hub import Hub, _should_send_default_pii, _get_client_options
+from sentry_sdk.utils import AnnotatedValue, capture_internal_exceptions
 from sentry_sdk._compat import reraise, implements_iterator
 
 
@@ -153,7 +148,7 @@ def get_client_ip(environ):
 def run_wsgi_app(app, environ, start_response):
     hub = Hub.current
     hub.push_scope()
-    with _internal_exceptions():
+    with capture_internal_exceptions():
         with hub.configure_scope() as scope:
             scope.add_event_processor(_make_wsgi_event_processor(environ))
 
@@ -208,7 +203,7 @@ def close(self):
 
 def _make_wsgi_event_processor(environ):
     def event_processor(event):
-        with _internal_exceptions():
+        with capture_internal_exceptions():
             # if the code below fails halfway through we at least have some data
             request_info = event.setdefault("request", {})
 

sentry_sdk/integrations/atexit.py

@@ -6,7 +6,7 @@
 
 from sentry_sdk.hub import Hub
 from sentry_sdk.utils import logger
-from . import Integration
+from sentry_sdk.integrations import Integration
 
 
 def default_shutdown_callback(pending, timeout):

sentry_sdk/integrations/celery.py

@@ -4,9 +4,8 @@
 from celery.exceptions import SoftTimeLimitExceeded
 
 from sentry_sdk import Hub
-from sentry_sdk.hub import _internal_exceptions
-
-from . import Integration
+from sentry_sdk.utils import capture_internal_exceptions
+from sentry_sdk.integrations import Integration
 
 
 class CeleryIntegration(Integration):
@@ -39,7 +38,7 @@ def _process_failure_signal(self, sender, task_id, einfo, **kw):
             hub.capture_exception(einfo.exc_info)
 
     def _handle_task_prerun(self, sender, task, **kw):
-        with _internal_exceptions():
+        with capture_internal_exceptions():
             hub = Hub.current
             hub.push_scope()
             with hub.configure_scope() as scope:

sentry_sdk/integrations/dedupe.py

@@ -1,7 +1,6 @@
 from sentry_sdk.api import configure_scope
 from sentry_sdk.utils import ContextVar
-
-from . import Integration
+from sentry_sdk.integrations import Integration
 
 
 _last_seen = ContextVar("last-seen")