Skip to content

ref: Make HTTP transport extensible #235

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
untitaker merged 1 commit into from
Jan 11, 2019
Merged

ref: Make HTTP transport extensible #235

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 25 additions & 22 deletions sentry_sdk/transport.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,24 +18,6 @@
from urllib import getproxies


def _make_pool(parsed_dsn, http_proxy, https_proxy, ca_certs):
# Use http_proxy if scheme is https and https_proxy is not set
proxy = parsed_dsn.scheme == "https" and https_proxy or http_proxy
if not proxy:
proxy = getproxies().get(parsed_dsn.scheme)

opts = {
"num_pools": 2,
"cert_reqs": "CERT_REQUIRED",
"ca_certs": ca_certs or certifi.where(),
}

if proxy:
return urllib3.ProxyManager(proxy, **opts)
else:
return urllib3.PoolManager(**opts)


class Transport(object):
"""Baseclass for all transports.

Expand Down Expand Up @@ -90,15 +72,16 @@ def __init__(self, options):
Transport.__init__(self, options)
self._worker = BackgroundWorker()
self._auth = self.parsed_dsn.to_auth("sentry.python/%s" % VERSION)
self._pool = _make_pool(
self._disabled_until = None
self._retry = urllib3.util.Retry()
self.options = options

self._pool = self._make_pool(
self.parsed_dsn,
http_proxy=options["http_proxy"],
https_proxy=options["https_proxy"],
ca_certs=options["ca_certs"],
)
self._disabled_until = None
self._retry = urllib3.util.Retry()
self.options = options

from sentry_sdk import Hub

Expand Down Expand Up @@ -148,6 +131,26 @@ def _send_event(self, event):

self._disabled_until = None

def _get_pool_options(self, ca_certs):
return {
"num_pools": 2,
"cert_reqs": "CERT_REQUIRED",
"ca_certs": ca_certs or certifi.where(),
}

def _make_pool(self, parsed_dsn, http_proxy, https_proxy, ca_certs):
# Use http_proxy if scheme is https and https_proxy is not set
proxy = parsed_dsn.scheme == "https" and https_proxy or http_proxy
if not proxy:
proxy = getproxies().get(parsed_dsn.scheme)

opts = self._get_pool_options(ca_certs)

if proxy:
return urllib3.ProxyManager(proxy, **opts)
else:
return urllib3.PoolManager(**opts)

def capture_event(self, event):
hub = self.hub_cls.current

Expand Down