fix: Change logging integration defaults (getsentry#93)

untitaker · web-flow · commit 4eae772e240a · 2018-09-29T23:12:26.000+02:00
* fix: Error logs are events

* fix: Make handler pass through kwargs

* fix: Fix logging test

* fix: Work around sanic logging
diff --git a/sentry_sdk/integrations/logging.py b/sentry_sdk/integrations/logging.py
@@ -12,6 +12,8 @@
 from sentry_sdk.hub import Hub
 from sentry_sdk.integrations import Integration
 
+DEFAULT_LEVEL = logging.INFO
+DEFAULT_EVENT_LEVEL = logging.ERROR
 
 _IGNORED_LOGGERS = set(["sentry_sdk.errors"])
 
@@ -27,7 +29,7 @@ def ignore_logger(name):
 class LoggingIntegration(Integration):
     identifier = "logging"
 
-    def __init__(self, level=logging.INFO, event_level=None):
+    def __init__(self, level=DEFAULT_LEVEL, event_level=DEFAULT_EVENT_LEVEL):
         self._handler = SentryHandler(level=level, event_level=event_level)
 
     def install(self):
@@ -43,8 +45,8 @@ def sentry_patched_callhandlers(self, record):
 
 
 class SentryHandler(logging.Handler, object):
-    def __init__(self, level, event_level):
-        logging.Handler.__init__(self, level)
+    def __init__(self, level=DEFAULT_LEVEL, event_level=DEFAULT_EVENT_LEVEL, **kwargs):
+        logging.Handler.__init__(self, level, **kwargs)
         if event_level is None:
             self._event_level = None
         else:
diff --git a/sentry_sdk/integrations/sanic.py b/sentry_sdk/integrations/sanic.py
@@ -7,6 +7,7 @@
 from sentry_sdk.utils import capture_internal_exceptions, event_from_exception
 from sentry_sdk.integrations import Integration
 from sentry_sdk.integrations._wsgi import RequestExtractor, _filter_headers
+from sentry_sdk.integrations.logging import ignore_logger
 
 from sanic import Sanic
 from sanic.router import Router
@@ -22,6 +23,11 @@ def install(self):
             # state between requests.
             raise RuntimeError("The sanic integration for Sentry requires Python 3.7+")
 
+        # Sanic 0.8 and older creates a logger named "root" and puts a
+        # stringified version of every exception in there (without exc_info),
+        # which our error deduplication can't detect.
+        ignore_logger("root")
+
         old_handle_request = Sanic.handle_request
 
         async def sentry_handle_request(self, request, *args, **kwargs):
diff --git a/tests/integrations/logging/test_logging.py b/tests/integrations/logging/test_logging.py
@@ -1,8 +1,6 @@
 import pytest
 import logging
 
-import sentry_sdk
-
 from sentry_sdk.integrations.logging import LoggingIntegration
 
 other_logger = logging.getLogger("testfoo")
@@ -33,11 +31,8 @@ def test_logging_defaults(integrations, sentry_init, capture_events):
 
     logger.info("bread")
     logger.critical("LOL")
-    assert not events
-
-    sentry_sdk.capture_exception(ValueError())
     event, = events
 
-    assert event["level"] == "error"
+    assert event["level"] == "fatal"
     assert any(crumb["message"] == "bread" for crumb in event["breadcrumbs"])
-    assert any(crumb["message"] == "LOL" for crumb in event["breadcrumbs"])
+    assert not any(crumb["message"] == "LOL" for crumb in event["breadcrumbs"])
