Merge branch 'master' into szokeasaurusrex/flaky-test

Author: szokeasaurusrex

sentry_sdk/integrations/django/__init__.py

@@ -116,6 +116,7 @@ class DjangoIntegration(Integration):
 
     identifier = "django"
     origin = f"auto.http.{identifier}"
+    origin_db = f"auto.db.{identifier}"
 
     transaction_style = ""
     middleware_spans = None
@@ -630,7 +631,7 @@ def execute(self, sql, params=None):
             params_list=params,
             paramstyle="format",
             executemany=False,
-            span_origin=DjangoIntegration.origin,
+            span_origin=DjangoIntegration.origin_db,
         ) as span:
             _set_db_data(span, self)
             options = (
@@ -663,7 +664,7 @@ def executemany(self, sql, param_list):
             params_list=param_list,
             paramstyle="format",
             executemany=True,
-            span_origin=DjangoIntegration.origin,
+            span_origin=DjangoIntegration.origin_db,
         ) as span:
             _set_db_data(span, self)
 
@@ -683,7 +684,7 @@ def connect(self):
         with sentry_sdk.start_span(
             op=OP.DB,
             description="connect",
-            origin=DjangoIntegration.origin,
+            origin=DjangoIntegration.origin_db,
         ) as span:
             _set_db_data(span, self)
             return real_connect(self)

tests/integrations/django/test_db_query_data.py

@@ -481,7 +481,10 @@ def test_db_span_origin_execute(sentry_init, client, capture_events):
     assert event["contexts"]["trace"]["origin"] == "auto.http.django"
 
     for span in event["spans"]:
-        assert span["origin"] == "auto.http.django"
+        if span["op"] == "db":
+            assert span["origin"] == "auto.db.django"
+        else:
+            assert span["origin"] == "auto.http.django"
 
 
 @pytest.mark.forked
@@ -520,4 +523,4 @@ def test_db_span_origin_executemany(sentry_init, client, capture_events):
     (event,) = events
 
     assert event["contexts"]["trace"]["origin"] == "manual"
-    assert event["spans"][0]["origin"] == "auto.http.django"
+    assert event["spans"][0]["origin"] == "auto.db.django"