chore: add some options

Author: untitaker

sentry_sdk/client.py

@@ -14,6 +14,7 @@
 
 class Client(object):
     def __init__(self, dsn=None, *args, **kwargs):
+        passed_dsn = dsn
         if dsn is NO_DSN:
             dsn = None
         else:
@@ -26,14 +27,14 @@ def __init__(self, dsn=None, *args, **kwargs):
         options = dict(DEFAULT_OPTIONS)
         options.update(*args, **kwargs)
         self.options = options
-        if dsn is None:
-            self._transport = None
-        else:
+        self._transport = self.options.pop('transport')
+        if self._transport is None and dsn is not None:
             self._transport = Transport(dsn)
             self._transport.start()
+        elif passed_dsn is not None and self._transport is not None:
+            raise ValueError("Cannot pass DSN and a custom transport.")
 
         from .integrations import logging as logging_integration
-
         integrations = list(options.pop("integrations") or ())
 
         logging_configured = any(
@@ -68,7 +69,7 @@ def _prepare_event(self, event, scope):
         if scope is not None:
             scope.apply_to_event(event)
 
-        for key in "release", "environment", "server_name":
+        for key in "release", "environment", "server_name", "repos", "dist":
             if event.get(key) is None:
                 event[key] = self.options[key]
         if event.get("sdk") is None:

sentry_sdk/consts.py

@@ -11,6 +11,9 @@
     "drain_timeout": 2.0,
     "integrations": [],
     "default_integrations": True,
+    'repos': {},
+    'dist': None,
+    'transport': None
 }
 
 SDK_INFO = {"name": "sentry-python", "version": VERSION}

tests/test_client.py

@@ -0,0 +1,17 @@
+import pytest
+from sentry_sdk import Client
+from sentry_sdk.transport import Transport
+
+def test_transport_option(monkeypatch):
+    dsn = 'https://[email protected]/123'
+    dsn2 = 'https://[email protected]/124'
+    assert str(Client(dsn=dsn).dsn) == dsn
+    assert Client().dsn is None
+    with pytest.raises(ValueError):
+        Client(dsn, transport=Transport(dsn2))
+    with pytest.raises(ValueError):
+        Client(dsn, transport=Transport(dsn))
+    assert str(Client(transport=Transport(dsn2)).dsn) == dsn2
+
+    monkeypatch.setenv("SENTRY_DSN", dsn)
+    assert str(Client(transport=Transport(dsn2)).dsn) == dsn2