feat: WIP of redis integration

untitaker · untitaker · commit 7a8b35dea415 · 2019-06-19T14:35:06.000+02:00
diff --git a/sentry_sdk/hub.py b/sentry_sdk/hub.py
@@ -10,7 +10,7 @@
 from sentry_sdk._compat import with_metaclass
 from sentry_sdk.scope import Scope
 from sentry_sdk.client import Client
-from sentry_sdk.tracing import Span
+from sentry_sdk.tracing import Span, maybe_create_breadcrumbs_from_span
 from sentry_sdk.utils import (
     exc_info_from_error,
     event_from_exception,
@@ -385,6 +385,7 @@ def span(self, span=None, **kwargs):
             span.set_tag("error", False)
         finally:
             span.finish()
+            maybe_create_breadcrumbs_from_span(self, span)
             self.finish_trace(span)
             scope.span = old_span
 
@@ -396,7 +397,7 @@ def start_span(self, **kwargs):
         span = scope.span
         if span is not None:
             return span.new_span(**kwargs)
-        return None
+        return Span.start_trace(**kwargs)
 
     def start_trace(self, span=None, **kwargs):
         if span is None:
diff --git a/sentry_sdk/integrations/redis.py b/sentry_sdk/integrations/redis.py
@@ -0,0 +1,39 @@
+from sentry_sdk import Hub
+from sentry_sdk.utils import capture_internal_exceptions
+from sentry_sdk.integrations import Integration
+
+
+class RedisIntegration(Integration):
+    identifier = "redis"
+
+    @staticmethod
+    def setup_once():
+        import redis
+
+        old_execute_command = redis.StrictRedis.execute_command
+
+        def sentry_patched_execute_command(self, name, *args, **kwargs):
+            hub = Hub.current
+
+            if hub.get_integration(RedisIntegration) is None:
+                return old_execute_command(self, name, *args, **kwargs)
+
+            description = name
+
+            with capture_internal_exceptions():
+                description_parts = [name]
+                for i, arg in enumerate(args):
+                    if i > 10:
+                        break
+
+                    description_parts.append(repr(arg))
+
+                description = " ".join(description_parts)
+
+            with hub.span(op="redis", description=description) as span:
+                if name and args and name.lower() in ("get", "set", "setex", "setnx"):
+                    span.set_tag("redis.key", args[0])
+
+                return old_execute_command(self, name, *args, **kwargs)
+
+        redis.StrictRedis.execute_command = sentry_patched_execute_command
diff --git a/sentry_sdk/integrations/stdlib.py b/sentry_sdk/integrations/stdlib.py
@@ -82,7 +82,7 @@ def getresponse(self, *args, **kwargs):
             raise
         except Exception:
             recorder.__exit__(*sys.exc_info())
-            pass
+            raise
         else:
             recorder.__exit__(None, None, None)
 
diff --git a/sentry_sdk/tracing.py b/sentry_sdk/tracing.py
@@ -199,7 +199,7 @@ def record_sql_queries(hub, queries, label=""):
             strings.append(query)
 
         description = concat_strings(strings)
-        with hub.span(op="db.statement", description=description) as span:
+        with hub.span(op="db", description=description) as span:
             yield span
 
 
@@ -210,21 +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
-        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)
+
+
+def maybe_create_breadcrumbs_from_span(hub, span):
+    if span.op == "redis":
+        hub.add_breadcrumb(type="redis", category="redis", data=span._tags)
+    elif span.op == "http" and not span._tags.get("error"):
+        hub.add_breadcrumb(
+            type="http",
+            category="httplib",
+            data=span._data,
+            hint={"httplib_response": span._data.get("httplib_response")},
+        )
diff --git a/tests/integrations/requests/test_requests.py b/tests/integrations/requests/test_requests.py
@@ -23,4 +23,5 @@ def test_crumb_capture(sentry_init, capture_events):
         "method": "GET",
         "status_code": 418,
         "reason": "I'M A TEAPOT",
+        "httplib_response": crumb["data"]["httplib_response"],
     }
diff --git a/tests/integrations/stdlib/test_httplib.py b/tests/integrations/stdlib/test_httplib.py
@@ -32,6 +32,7 @@ def test_crumb_capture(sentry_init, capture_events):
         "method": "GET",
         "status_code": 200,
         "reason": "OK",
+        "httplib_response": crumb["data"]["httplib_response"],
     }
 
 
@@ -61,6 +62,7 @@ def before_breadcrumb(crumb, hint):
         "status_code": 200,
         "reason": "OK",
         "extra": "foo",
+        "httplib_response": crumb["data"]["httplib_response"],
     }
 
 
@@ -102,4 +104,5 @@ def test_httplib_misuse(sentry_init, capture_events):
         "method": "GET",
         "status_code": 200,
         "reason": "OK",
+        "httplib_response": crumb["data"]["httplib_response"],
     }

Original file line number	Diff line number	Diff line change
`@@ -23,4 +23,5 @@ def test_crumb_capture(sentry_init, capture_events):`
`23`	`23`	`"method": "GET",`
`24`	`24`	`"status_code": 418,`
`25`	`25`	`"reason": "I'M A TEAPOT",`
	`26`	`+ "httplib_response": crumb["data"]["httplib_response"],`
`26`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ def test_crumb_capture(sentry_init, capture_events):`
`32`	`32`	`"method": "GET",`
`33`	`33`	`"status_code": 200,`
`34`	`34`	`"reason": "OK",`
	`35`	`+ "httplib_response": crumb["data"]["httplib_response"],`
`35`	`36`	`}`
`36`	`37`
`37`	`38`
`@@ -61,6 +62,7 @@ def before_breadcrumb(crumb, hint):`
`61`	`62`	`"status_code": 200,`
`62`	`63`	`"reason": "OK",`
`63`	`64`	`"extra": "foo",`
	`65`	`+ "httplib_response": crumb["data"]["httplib_response"],`
`64`	`66`	`}`
`65`	`67`
`66`	`68`
`@@ -102,4 +104,5 @@ def test_httplib_misuse(sentry_init, capture_events):`
`102`	`104`	`"method": "GET",`
`103`	`105`	`"status_code": 200,`
`104`	`106`	`"reason": "OK",`
	`107`	`+ "httplib_response": crumb["data"]["httplib_response"],`
`105`	`108`	`}`