chore: actually implement http_proxy properly

Author: untitaker

sentry_sdk/consts.py

@@ -1,4 +1,3 @@
-import os
 import socket
 
 VERSION = "0.1"
@@ -17,8 +16,8 @@
     "transport": None,
     "sample_rate": 1.0,
     "send_default_pii": False,
-    "http_proxy": os.environ.get("http_proxy"),
-    "https_proxy": os.environ.get("https_proxy"),
+    "http_proxy": None,
+    "https_proxy": None,
     "ignore_errors": (),
 }
 

sentry_sdk/transport.py

@@ -10,22 +10,24 @@
 from ._compat import queue
 from .consts import VERSION
 
+try:
+    from urllib.request import getproxies
+except ImportError:
+    from urllib import getproxies
+
 
 logger = logging.getLogger(__name__)
 
 
-def _make_pool(http_proxy, https_proxy):
-    if https_proxy and http_proxy:
-        raise ValueError("Either http_proxy or https_proxy can be set, not " "both.")
-    elif https_proxy and not https_proxy.startswith("https://"):
-        raise ValueError("https_proxy URL must have https scheme.")
-    elif http_proxy and not http_proxy.startswith("http://"):
-        raise ValueError("http_proxy URL must have http scheme.")
+def _make_pool(dsn, http_proxy, https_proxy):
+    proxy = https_proxy if dsn == "https" else http_proxy
+    if not proxy:
+        proxy = getproxies().get(dsn.scheme)
 
-    opts = {"num_pools": 2, "cert_reqs": "CERT_REQUIRED", "ca_certs": certifi.where()}
+    opts = {"num_pools": 2, "cert_reqs": "CERT_NONE", "ca_certs": certifi.where()}
 
-    if https_proxy or http_proxy:
-        return urllib3.ProxyManager(https_proxy or http_proxy, **opts)
+    if proxy:
+        return urllib3.ProxyManager(proxy, **opts)
     else:
         return urllib3.PoolManager(**opts)
 
@@ -93,7 +95,7 @@ def __init__(self, dsn, http_proxy=None, https_proxy=None):
         self.dsn = dsn
         self._queue = None
         self._done = False
-        self._pool = _make_pool(http_proxy=http_proxy, https_proxy=https_proxy)
+        self._pool = _make_pool(dsn, http_proxy=http_proxy, https_proxy=https_proxy)
 
     def start(self):
         if self._queue is None:

tests/test_client.py

@@ -1,6 +1,6 @@
 import pytest
 from sentry_sdk import Client
-from sentry_sdk.utils import Event
+from sentry_sdk.utils import Event, Dsn
 from sentry_sdk.transport import Transport
 
 
@@ -10,13 +10,13 @@ def test_transport_option(monkeypatch):
     assert str(Client(dsn=dsn).dsn) == dsn
     assert Client().dsn is None
     with pytest.raises(ValueError):
-        Client(dsn, transport=Transport(dsn2))
+        Client(dsn, transport=Transport(Dsn(dsn2)))
     with pytest.raises(ValueError):
-        Client(dsn, transport=Transport(dsn))
-    assert str(Client(transport=Transport(dsn2)).dsn) == dsn2
+        Client(dsn, transport=Transport(Dsn(dsn)))
+    assert str(Client(transport=Transport(Dsn(dsn2))).dsn) == dsn2
 
     monkeypatch.setenv("SENTRY_DSN", dsn)
-    assert str(Client(transport=Transport(dsn2)).dsn) == dsn2
+    assert str(Client(transport=Transport(Dsn(dsn2))).dsn) == dsn2
 
 
 def test_ignore_errors():