fix: Additional safeguards for tracing code

untitaker · untitaker · commit 99e60c4e5c97 · 2019-07-05T20:42:48.000+02:00
diff --git a/sentry_sdk/hub.py b/sentry_sdk/hub.py
@@ -446,9 +446,12 @@ def span(
         else:
             span.set_tag("error", False)
         finally:
-            span.finish()
-            maybe_create_breadcrumbs_from_span(self, span)
-            self.finish_span(span)
+            try:
+                span.finish()
+                maybe_create_breadcrumbs_from_span(self, span)
+                self.finish_span(span)
+            except Exception:
+                self._capture_internal_exception(sys.exc_info())
             scope.span = old_span
 
     def start_span(
diff --git a/sentry_sdk/integrations/_sql_common.py b/sentry_sdk/integrations/_sql_common.py
@@ -61,7 +61,7 @@ def format_sql(sql, params, cursor):
     except Exception:
         pass
 
-    if not real_sql and cursor and hasattr(cursor, "mogrify"):
+    if not real_sql and hasattr(cursor, "mogrify"):
         # If formatting failed and we're using psycopg2, it could be that we're
         # looking at a query that uses Composed objects. Use psycopg2's mogrify
         # function to format the query. We lose per-parameter trimming but gain
@@ -71,7 +71,7 @@ def format_sql(sql, params, cursor):
         # queries are not widely used, while per-parameter trimming is
         # generally highly desirable.
         try:
-            if cursor and hasattr(cursor, "mogrify"):
+            if hasattr(cursor, "mogrify"):
                 real_sql = cursor.mogrify(sql, params)
                 if isinstance(real_sql, bytes):
                     real_sql = real_sql.decode(cursor.connection.encoding)
diff --git a/sentry_sdk/integrations/django/__init__.py b/sentry_sdk/integrations/django/__init__.py
@@ -387,7 +387,7 @@ def install_sql_hook():
     def execute(self, sql, params=None):
         hub = Hub.current
         if hub.get_integration(DjangoIntegration) is None:
-            return
+            return real_execute(self, sql, params)
 
         with record_sql_queries(
             hub, [format_sql(sql, params, self.cursor)], label="Django: "
@@ -397,7 +397,7 @@ def execute(self, sql, params=None):
     def executemany(self, sql, param_list):
         hub = Hub.current
         if hub.get_integration(DjangoIntegration) is None:
-            return
+            return real_executemany(self, sql, param_list)
 
         with record_sql_queries(
             hub,
diff --git a/sentry_sdk/tracing.py b/sentry_sdk/tracing.py
@@ -5,7 +5,7 @@
 
 from datetime import datetime
 
-from sentry_sdk.utils import concat_strings
+from sentry_sdk.utils import capture_internal_exceptions, concat_strings
 
 
 if False:
@@ -211,14 +211,20 @@ def record_sql_queries(hub, queries, label=""):
     if not queries:
         yield None
     else:
-        strings = [label]
-        for query in queries:
-            hub.add_breadcrumb(message=query, category="query")
-            strings.append(query)
-
-        description = concat_strings(strings)
-        with hub.span(op="db", description=description) as span:
-            yield span
+        description = None
+        with capture_internal_exceptions():
+            strings = [label]
+            for query in queries:
+                hub.add_breadcrumb(message=query, category="query")
+                strings.append(query)
+
+            description = concat_strings(strings)
+
+        if description is None:
+            yield None
+        else:
+            with hub.span(op="db", description=description) as span:
+                yield span
 
 
 @contextlib.contextmanager
