fix: Restore breadcrumb for http calls, fix tests

untitaker · untitaker · commit d710109f5a68 · 2019-06-11T18:51:05.000+02:00
diff --git a/sentry_sdk/integrations/django/__init__.py b/sentry_sdk/integrations/django/__init__.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import
 
-import contextlib
 import sys
 import weakref
+import contextlib
 
 from django import VERSION as DJANGO_VERSION  # type: ignore
 from django.db.models.query import QuerySet  # type: ignore
@@ -332,11 +332,12 @@ def format_sql(sql, params):
     return sql, rv
 
 
+@contextlib.contextmanager
 def record_sql(sql, param_list, cursor=None):
     # type: (Any, Any, Any) -> Generator
     hub = Hub.current
     if hub.get_integration(DjangoIntegration) is None:
-        yield
+        yield None
         return
 
     formatted_queries = []
@@ -374,7 +375,8 @@ def record_sql(sql, param_list, cursor=None):
         if real_sql:
             formatted_queries.append(real_sql)
 
-    return record_sql_queries(hub, formatted_queries)
+    with record_sql_query(hub, formatted_queries):
+        yield
 
 
 def install_sql_hook():
@@ -397,7 +399,7 @@ def execute(self, sql, params=None):
             return real_execute(self, sql, params)
 
     def executemany(self, sql, param_list):
-        with record_many_sql(sql, param_list, self.cursor):
+        with record_sql(sql, param_list, self.cursor):
             return real_executemany(self, sql, param_list)
 
     CursorWrapper.execute = execute
diff --git a/sentry_sdk/integrations/stdlib.py b/sentry_sdk/integrations/stdlib.py
@@ -1,3 +1,5 @@
+import sys
+
 from sentry_sdk.hub import Hub
 from sentry_sdk.integrations import Integration
 from sentry_sdk.tracing import record_http_request
diff --git a/sentry_sdk/tracing.py b/sentry_sdk/tracing.py
@@ -180,7 +180,15 @@ def record_http_request(hub, url, method):
             yield data_dict
         finally:
             httplib_response = data_dict.pop("httplib_response", 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 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},
+            )
diff --git a/tests/test_tracing.py b/tests/test_tracing.py
@@ -19,9 +19,10 @@ def test_basic(sentry_init, capture_events, sample_rate):
     if sample_rate:
         event, = events
 
-        span1, span2, parent_span = event["spans"]
-        assert not span1["tags"]["success"]
-        assert span2["tags"]["success"]
+        span1, span2 = event["spans"]
+        parent_span = event
+        assert span1["tags"]["error"]
+        assert not span2["tags"]["error"]
         assert parent_span["transaction"] == "hi"
     else:
         assert not events

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+import sys`
	`2`	`+`
`1`	`3`	`from sentry_sdk.hub import Hub`
`2`	`4`	`from sentry_sdk.integrations import Integration`
`3`	`5`	`from sentry_sdk.tracing import record_http_request`