fix: Debug info in transport

Fix #118

Author: untitaker

sentry_sdk/transport.py

@@ -94,53 +94,63 @@ def __init__(self, options):
         self._retry = urllib3.util.Retry()
         self.options = options
 
+        from sentry_sdk import Hub
+
+        self.hub_cls = Hub
+
     def _send_event(self, event):
         if self._disabled_until is not None:
             if datetime.utcnow() < self._disabled_until:
                 return
             self._disabled_until = None
 
-        with capture_internal_exceptions():
-            body = io.BytesIO()
-            with gzip.GzipFile(fileobj=body, mode="w") as f:
-                f.write(json.dumps(event).encode("utf-8"))
-
-            logger.debug(
-                "Sending %s event [%s] to %s project:%s"
-                % (
-                    event.get("level") or "error",
-                    event["event_id"],
-                    self.parsed_dsn.host,
-                    self.parsed_dsn.project_id,
-                )
-            )
-            response = self._pool.request(
-                "POST",
-                str(self._auth.store_api_url),
-                body=body.getvalue(),
-                headers={
-                    "X-Sentry-Auth": str(self._auth.to_header()),
-                    "Content-Type": "application/json",
-                    "Content-Encoding": "gzip",
-                },
+        body = io.BytesIO()
+        with gzip.GzipFile(fileobj=body, mode="w") as f:
+            f.write(json.dumps(event).encode("utf-8"))
+
+        logger.debug(
+            "Sending %s event [%s] to %s project:%s"
+            % (
+                event.get("level") or "error",
+                event["event_id"],
+                self.parsed_dsn.host,
+                self.parsed_dsn.project_id,
             )
+        )
+        response = self._pool.request(
+            "POST",
+            str(self._auth.store_api_url),
+            body=body.getvalue(),
+            headers={
+                "X-Sentry-Auth": str(self._auth.to_header()),
+                "Content-Type": "application/json",
+                "Content-Encoding": "gzip",
+            },
+        )
 
-            try:
-                if response.status == 429:
-                    self._disabled_until = datetime.utcnow() + timedelta(
-                        seconds=self._retry.get_retry_after(response)
-                    )
-                    return
+        try:
+            if response.status == 429:
+                self._disabled_until = datetime.utcnow() + timedelta(
+                    seconds=self._retry.get_retry_after(response)
+                )
+                return
 
-                elif response.status >= 300 or response.status < 200:
-                    raise ValueError("Unexpected status code: %s" % response.status)
-            finally:
-                response.close()
+            elif response.status >= 300 or response.status < 200:
+                raise ValueError("Unexpected status code: %s" % response.status)
+        finally:
+            response.close()
 
-            self._disabled_until = None
+        self._disabled_until = None
 
     def capture_event(self, event):
-        self._worker.submit(lambda: self._send_event(event))
+        hub = self.hub_cls.current
+
+        def send_event_wrapper():
+            with hub:
+                with capture_internal_exceptions():
+                    self._send_event(event)
+
+        self._worker.submit(send_event_wrapper)
 
     def shutdown(self, timeout, callback=None):
         logger.debug("Shutting down HTTP transport orderly")

tests/test_client.py

@@ -1,8 +1,10 @@
 # coding: utf-8
-import time
+import logging
 import pytest
-import sys
 import subprocess
+import sys
+import time
+
 from datetime import datetime
 from textwrap import dedent
 from sentry_sdk import Hub, Client, configure_scope, capture_message, add_breadcrumb
@@ -201,10 +203,14 @@ def callback(scope):
     assert not calls
 
 
-def test_transport_works(httpserver, request, capsys):
+@pytest.mark.parametrize("debug", (True, False))
+def test_transport_works(httpserver, request, capsys, caplog, debug):
     httpserver.serve_content("ok", 200)
+    caplog.set_level(logging.DEBUG)
 
-    client = Client("http://foobar@{}/123".format(httpserver.url[len("http://") :]))
+    client = Client(
+        "http://foobar@{}/123".format(httpserver.url[len("http://") :]), debug=debug
+    )
     Hub.current.bind_client(client)
     request.addfinalizer(lambda: Hub.current.bind_client(None))
 
@@ -216,6 +222,8 @@ def test_transport_works(httpserver, request, capsys):
     assert not err and not out
     assert httpserver.requests
 
+    assert any("Sending info event" in record.msg for record in caplog.records) == debug
+
 
 @pytest.mark.tests_internal_exceptions
 def test_client_debug_option_enabled(sentry_init, caplog):