feat: ignore_errors option

untitaker · untitaker · commit 663c755bf2bf · 2018-07-30T11:35:21.000+02:00
diff --git a/sentry_sdk/client.py b/sentry_sdk/client.py
@@ -1,6 +1,7 @@
 import os
 import uuid
 import random
+import inspect
 
 from .utils import Dsn, SkipEvent, ContextVar
 from .transport import Transport
@@ -67,11 +68,6 @@ def _prepare_event(self, event, scope):
         if event.get("event_id") is None:
             event["event_id"] = uuid.uuid4().hex
 
-        if event._exc_value is not None:
-            if _most_recent_exception.get(None) is event._exc_value:
-                raise SkipEvent()
-            _most_recent_exception.set(event._exc_value)
-
         if scope is not None:
             scope.apply_to_event(event)
 
@@ -84,21 +80,34 @@ def _prepare_event(self, event, scope):
         if event.get("platform") is None:
             event["platform"] = "python"
 
+        event = strip_event(event)
+        event = flatten_metadata(event)
+        return event
+
+    def _check_should_capture(self, event):
         if (
             self.options["sample_rate"] < 1.0
             and random.random() >= self.options["sample_rate"]
         ):
             raise SkipEvent()
 
-        event = strip_event(event)
-        event = flatten_metadata(event)
-        return event
+        if event._exc_value is not None:
+            exclusions = self.options["ignore_errors"]
+            exc_type = type(event._exc_value)
+
+            if any(inspect.isclass(e) and issubclass(exc_type, e) for e in exclusions):
+                raise SkipEvent()
+
+            if _most_recent_exception.get(None) is event._exc_value:
+                raise SkipEvent()
+            _most_recent_exception.set(event._exc_value)
 
     def capture_event(self, event, scope=None):
         """Captures an event."""
         if self._transport is None:
             return
         try:
+            self._check_should_capture(event)
             event = self._prepare_event(event, scope)
         except SkipEvent:
             return
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
@@ -19,6 +19,7 @@
     "send_default_pii": False,
     "http_proxy": os.environ.get("http_proxy"),
     "https_proxy": os.environ.get("https_proxy"),
+    "ignore_errors": (),
 }
 
 SDK_INFO = {"name": "sentry-python", "version": VERSION}
diff --git a/sentry_sdk/transport.py b/sentry_sdk/transport.py
@@ -89,7 +89,7 @@ def thread():
 
 
 class Transport(object):
-    def __init__(self, dsn, http_proxy, https_proxy):
+    def __init__(self, dsn, http_proxy=None, https_proxy=None):
         self.dsn = dsn
         self._queue = None
         self._done = False
diff --git a/tests/test_client.py b/tests/test_client.py
@@ -1,5 +1,6 @@
 import pytest
 from sentry_sdk import Client
+from sentry_sdk.utils import Event
 from sentry_sdk.transport import Transport
 
 
@@ -16,3 +17,28 @@ def test_transport_option(monkeypatch):
 
     monkeypatch.setenv("SENTRY_DSN", dsn)
     assert str(Client(transport=Transport(dsn2)).dsn) == dsn2
+
+
+def test_ignore_errors():
+    def e(exc_type):
+        rv = Event()
+        rv._exc_value = exc_type()
+        return rv
+
+    class EventCaptured(Exception):
+        pass
+
+    class TestTransport(Transport):
+        def __init__(self, *a, **kw):
+            pass
+
+        def start(self):
+            pass
+
+        def capture_event(self, event):
+            raise EventCaptured()
+
+    c = Client(ignore_errors=[Exception], transport=TestTransport())
+    c.capture_event(e(Exception))
+    c.capture_event(e(ValueError))
+    pytest.raises(EventCaptured, lambda: c.capture_event(e(BaseException)))

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@`
`19`	`19`	`"send_default_pii": False,`
`20`	`20`	`"http_proxy": os.environ.get("http_proxy"),`
`21`	`21`	`"https_proxy": os.environ.get("https_proxy"),`
	`22`	`+ "ignore_errors": (),`
`22`	`23`	`}`
`23`	`24`
`24`	`25`	`SDK_INFO = {"name": "sentry-python", "version": VERSION}`