fix: un-expose Event type

Author: untitaker

sentry_sdk/client.py

@@ -3,7 +3,7 @@
 import random
 import atexit
 
-from .utils import Dsn, SkipEvent, ContextVar
+from .utils import Dsn, SkipEvent, ContextVar, Event
 from .transport import Transport
 from .consts import DEFAULT_OPTIONS, SDK_INFO
 from .stripping import strip_event, flatten_metadata
@@ -121,6 +121,8 @@ def capture_event(self, event, scope=None):
         """Captures an event."""
         if self._transport is None:
             return
+        if not isinstance(event, Event):
+            event = Event(event)
         try:
             self._check_should_capture(event)
             event = self._prepare_event(event, scope)

sentry_sdk/utils.py

@@ -316,12 +316,15 @@ def exceptions_from_error_tuple(exc_type, exc_value, tb, with_locals=True):
 class Event(Mapping):
     __slots__ = ("_data", "_exc_value")
 
-    def __init__(self):
+    def __init__(self, data={}):
         self._data = {
             "event_id": uuid.uuid4().hex,
             "timestamp": datetime.utcnow().strftime("%Y-%m-%dT%H:%M:%SZ"),
             "level": "error",
         }
+
+        self._data.update(data)
+
         self._exc_value = None
 
     def get_json(self):

tests/test_client.py

@@ -8,6 +8,19 @@
 from sentry_sdk.transport import Transport
 from sentry_sdk.utils import Event, Dsn
 
+class EventCaptured(Exception):
+    pass
+
+class _TestTransport(Transport):
+    def __init__(self, *a, **kw):
+        pass
+
+    def start(self):
+        pass
+
+    def capture_event(self, event):
+        raise EventCaptured()
+
 
 def test_transport_option(monkeypatch):
     dsn = "https://foo@sentry.io/123"
@@ -30,25 +43,18 @@ def e(exc_type):
         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 = 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)))
 
 
+def test_capture_event_works():
+    c = Client(transport=_TestTransport())
+    pytest.raises(EventCaptured, lambda: c.capture_event({}))
+    pytest.raises(EventCaptured, lambda: c.capture_event(Event()))
+
+
 @pytest.mark.parametrize("num_messages", [10, 20])
 def test_atexit(tmpdir, monkeypatch, num_messages):
     app = tmpdir.join("app.py")