fix: Fix bug in requests instrumentation

untitaker · untitaker · commit 05d8a41435aa · 2019-06-19T12:55:53.000+02:00
diff --git a/sentry_sdk/integrations/stdlib.py b/sentry_sdk/integrations/stdlib.py
@@ -62,18 +62,29 @@ def putrequest(self, method, url, *args, **kwargs):
 
     def getresponse(self, *args, **kwargs):
         recorder = getattr(self, "_sentrysdk_recorder", None)
+
+        if recorder is None:
+            return real_getresponse(self, *args, **kwargs)
+
         data_dict = getattr(self, "_sentrysdk_data_dict", None)
 
         try:
             rv = real_getresponse(self, *args, **kwargs)
 
-            if recorder is not None and data_dict is not None:
+            if data_dict is not None:
                 data_dict["httplib_response"] = rv
                 data_dict["status_code"] = rv.status
                 data_dict["reason"] = rv.reason
-        finally:
-            if recorder is not None:
-                recorder.__exit__(*sys.exc_info())
+        except TypeError:
+            # python-requests provokes a typeerror to discover py3 vs py2 differences
+            #
+            # > TypeError("getresponse() got an unexpected keyword argument 'buffering'")
+            raise
+        except Exception:
+            recorder.__exit__(*sys.exc_info())
+            pass
+        else:
+            recorder.__exit__(None, None, None)
 
         return rv
 
diff --git a/sentry_sdk/tracing.py b/sentry_sdk/tracing.py
@@ -1,5 +1,4 @@
 import re
-import sys
 import uuid
 import contextlib
 
@@ -211,19 +210,21 @@ def record_http_request(hub, url, method):
     with hub.span(op="http", description="%s %s" % (url, method)) as span:
         try:
             yield data_dict
-        finally:
+        except Exception:
+            httplib_response = data_dict.pop("httplib_response", None)
+            raise
+        else:
             httplib_response = data_dict.pop("httplib_response", None)
 
+            hub.add_breadcrumb(
+                type="http",
+                category="httplib",
+                data=data_dict,
+                hint={"httplib_response": httplib_response},
+            )
+        finally:
             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)
-
-            if sys.exc_info()[1] is None:
-                hub.add_breadcrumb(
-                    type="http",
-                    category="httplib",
-                    data=data_dict,
-                    hint={"httplib_response": httplib_response},
-                )
