feat: implement http_proxy options

Author: untitaker

sentry_sdk/client.py

@@ -30,7 +30,11 @@ def __init__(self, dsn=None, *args, **kwargs):
         self.options = options
         self._transport = self.options.pop("transport")
         if self._transport is None and dsn is not None:
-            self._transport = Transport(dsn)
+            self._transport = Transport(
+                dsn=dsn,
+                http_proxy=self.options.pop("http_proxy"),
+                https_proxy=self.options.pop("https_proxy"),
+            )
             self._transport.start()
         elif passed_dsn is not None and self._transport is not None:
             raise ValueError("Cannot pass DSN and a custom transport.")

sentry_sdk/consts.py

@@ -1,3 +1,4 @@
+import os
 import socket
 
 VERSION = "0.1"
@@ -16,6 +17,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"),
 }
 
 SDK_INFO = {"name": "sentry-python", "version": VERSION}

sentry_sdk/transport.py

@@ -1,4 +1,3 @@
-import os
 import json
 import time
 import zlib
@@ -15,23 +14,29 @@
 logger = logging.getLogger(__name__)
 
 
-def _make_pool():
-    proxy = os.environ.get("HTTP_PROXY")
+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.")
+
     opts = {"num_pools": 2, "cert_reqs": "CERT_REQUIRED", "ca_certs": certifi.where()}
-    if proxy is not None:
-        return urllib3.ProxyManager(proxy, **opts)
+
+    if https_proxy or http_proxy:
+        return urllib3.ProxyManager(https_proxy or http_proxy, **opts)
     else:
         return urllib3.PoolManager(**opts)
 
 
 _SHUTDOWN = object()
-_pool = _make_pool()
 _retry = urllib3.util.Retry()
 
 
-def send_event(event, auth):
+def send_event(pool, event, auth):
     body = zlib.compress(json.dumps(event).encode("utf-8"))
-    response = _pool.request(
+    response = pool.request(
         "POST",
         auth.store_api_url,
         body=body,
@@ -73,7 +78,7 @@ def thread():
                 break
 
             try:
-                disabled_until = send_event(item, auth)
+                disabled_until = send_event(transport._pool, item, auth)
             except Exception:
                 logger.exception("Could not send sentry event")
                 continue
@@ -84,10 +89,11 @@ def thread():
 
 
 class Transport(object):
-    def __init__(self, dsn):
+    def __init__(self, dsn, http_proxy, https_proxy):
         self.dsn = dsn
         self._queue = None
         self._done = False
+        self._pool = _make_pool(http_proxy=http_proxy, https_proxy=https_proxy)
 
     def start(self):
         if self._queue is None: