fix: Fix httplib tests

untitaker · untitaker · commit 07151ce4a526 · 2019-06-11T19:09:25.000+02:00
diff --git a/sentry_sdk/integrations/stdlib.py b/sentry_sdk/integrations/stdlib.py
@@ -43,19 +43,21 @@ def putrequest(self, method, url, *args, **kwargs):
                 url,
             )
 
-        self._sentrysdk_recorder = record_http_request(hub, real_url, method)
-        self._sentrysdk_data_dict = self._sentrysdk_recorder.__enter__()
+        recorder = record_http_request(hub, real_url, method)
+        data_dict = recorder.__enter__()
 
         try:
             rv = real_putrequest(self, method, url, *args, **kwargs)
 
             for key, value in hub.iter_trace_propagation_headers():
                 self.putheader(key, value)
         except Exception:
-            self._sentrysdk_recorder.__exit__(*sys.exc_info())
-            self._sentrysdk_recorder = self._sentrysdk_data_dict = None
+            recorder.__exit__(*sys.exc_info())
             raise
 
+        self._sentrysdk_recorder = recorder
+        self._sentrysdk_data_dict = data_dict
+
         return rv
 
     def getresponse(self, *args, **kwargs):
@@ -72,7 +74,6 @@ def getresponse(self, *args, **kwargs):
         finally:
             if recorder is not None:
                 recorder.__exit__(*sys.exc_info())
-            self._sentrysdk_recorder = self._sentrysdk_data_dict = None
 
         return rv
 
diff --git a/sentry_sdk/integrations/wsgi.py b/sentry_sdk/integrations/wsgi.py
@@ -84,7 +84,7 @@ def __call__(self, environ, start_response):
                     scope._name = "wsgi"
                     scope.add_event_processor(_make_wsgi_event_processor(environ))
 
-            with hub.trace(span=Span.continue_from_environ(environ)):
+            with hub.span(Span.continue_from_environ(environ)):
                 try:
                     rv = self.app(environ, start_response)
                 except BaseException:
diff --git a/sentry_sdk/tracing.py b/sentry_sdk/tracing.py
@@ -1,4 +1,5 @@
 import re
+import sys
 import uuid
 import contextlib
 
@@ -186,15 +187,17 @@ def record_http_request(hub, url, method):
             yield data_dict
         finally:
             httplib_response = data_dict.pop("httplib_response", None)
+
             if span is not None:
                 if "status_code" in data_dict:
                     span.set_tag("http.status_code", data_dict["status_code"])
                 for k, v in data_dict.items():
                     span.set_data(k, v)
 
-            hub.add_breadcrumb(
-                type="http",
-                category="httplib",
-                data=data_dict,
-                hint={"httplib_response": httplib_response},
-            )
+            if sys.exc_info()[1] is None:
+                hub.add_breadcrumb(
+                    type="http",
+                    category="httplib",
+                    data=data_dict,
+                    hint={"httplib_response": httplib_response},
+                )
