ref: Prepend label to SQL span description

untitaker · untitaker · commit 82d70583647d · 2019-06-19T11:31:20.000+02:00
diff --git a/sentry_sdk/integrations/django/__init__.py b/sentry_sdk/integrations/django/__init__.py
@@ -312,7 +312,9 @@ def execute(self, sql, params=None):
         if hub.get_integration(DjangoIntegration) is None:
             return
 
-        with record_sql_queries(hub, [format_sql(sql, params, self.cursor)]):
+        with record_sql_queries(
+            hub, [format_sql(sql, params, self.cursor)], label="Django: "
+        ):
             return real_execute(self, sql, params)
 
     def executemany(self, sql, param_list):
@@ -321,7 +323,9 @@ def executemany(self, sql, param_list):
             return
 
         with record_sql_queries(
-            hub, [format_sql(sql, params, self.cursor) for params in param_list]
+            hub,
+            [format_sql(sql, params, self.cursor) for params in param_list],
+            label="Django: ",
         ):
             return real_executemany(self, sql, param_list)
 
diff --git a/sentry_sdk/tracing.py b/sentry_sdk/tracing.py
@@ -190,14 +190,16 @@ def get_trace_context(self):
 
 
 @contextlib.contextmanager
-def record_sql_queries(hub, queries):
+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(queries)
+        description = concat_strings(strings)
         with hub.span(op="db.statement", description=description) as span:
             yield span
 
