.

Author: alexander-alderman-webb

sentry_sdk/integrations/django/__init__.py

@@ -715,6 +715,9 @@ def _set_db_data(span, cursor_or_db, db_operation=None):
     vendor = db.vendor
     span.set_data(SPANDATA.DB_SYSTEM, vendor)
 
+    if db_operation is not None:
+        span.set_data(SPANDATA.DB_OPERATION, db_operation)
+
     # Some custom backends override `__getattr__`, making it look like `cursor_or_db`
     # actually has a `connection` and the `connection` has a `get_dsn_parameters`
     # attribute, only to throw an error once you actually want to call it.
@@ -748,9 +751,6 @@ def _set_db_data(span, cursor_or_db, db_operation=None):
     if db_name is not None:
         span.set_data(SPANDATA.DB_NAME, db_name)
 
-    if db_operation is not None:
-        span.set_data(SPANDATA.DB_OPERATION, db_operation)
-
     server_address = connection_params.get("host")
     if server_address is not None:
         span.set_data(SPANDATA.SERVER_ADDRESS, server_address)

tests/integrations/django/test_db_query_data.py

@@ -5,8 +5,7 @@
 from unittest import mock
 
 from django import VERSION as DJANGO_VERSION
-from django.db import connection, connections, transaction
-from django.contrib.auth.models import User
+from django.db import connections
 
 try:
     from django.urls import reverse
@@ -16,7 +15,7 @@
 from werkzeug.test import Client
 
 from sentry_sdk import start_transaction
-from sentry_sdk.consts import SPANDATA, DBOPERATION
+from sentry_sdk.consts import SPANDATA
 from sentry_sdk.integrations.django import DjangoIntegration
 from sentry_sdk.tracing_utils import record_sql_queries
 
@@ -525,220 +524,3 @@ def test_db_span_origin_executemany(sentry_init, client, capture_events):
 
     assert event["contexts"]["trace"]["origin"] == "manual"
     assert event["spans"][0]["origin"] == "auto.db.django"
-
-
-@pytest.mark.forked
-@pytest_mark_django_db_decorator(transaction=True)
-def test_db_no_autocommit_execute(sentry_init, client, capture_events):
-    sentry_init(
-        integrations=[DjangoIntegration()],
-        traces_sample_rate=1.0,
-    )
-
-    if "postgres" not in connections:
-        pytest.skip("postgres tests disabled")
-
-    # trigger Django to open a new connection by marking the existing one as None.
-    connections["postgres"].connection = None
-
-    events = capture_events()
-
-    client.get(reverse("postgres_insert_orm_no_autocommit"))
-
-    (event,) = events
-
-    # Ensure operation is persisted
-    assert User.objects.using("postgres").exists()
-
-    assert event["contexts"]["trace"]["origin"] == "auto.http.django"
-
-    for span in event["spans"]:
-        if span["op"] == "db":
-            assert span["origin"] == "auto.db.django"
-        else:
-            assert span["origin"] == "auto.http.django"
-
-    commit_spans = [
-        span
-        for span in event["spans"]
-        if span["data"].get(SPANDATA.DB_OPERATION) == DBOPERATION.COMMIT
-    ]
-    assert len(commit_spans) == 1
-    commit_span = commit_spans[0]
-    assert commit_span["origin"] == "auto.db.django"
-
-
-@pytest.mark.forked
-@pytest_mark_django_db_decorator(transaction=True)
-def test_db_no_autocommit_executemany(sentry_init, client, capture_events):
-    sentry_init(
-        integrations=[DjangoIntegration()],
-        traces_sample_rate=1.0,
-    )
-
-    events = capture_events()
-
-    if "postgres" not in connections:
-        pytest.skip("postgres tests disabled")
-
-    with start_transaction(name="test_transaction"):
-        from django.db import connection, transaction
-
-        cursor = connection.cursor()
-
-        query = """INSERT INTO auth_user (
-    password,
-    is_superuser,
-    username,
-    first_name,
-    last_name,
-    email,
-    is_staff,
-    is_active,
-    date_joined
-)
-VALUES ('password', false, %s, %s, %s, %s, false, true, %s);"""
-
-        query_list = (
-            (
-                "user1",
-                "John",
-                "Doe",
-                "[email protected]",
-                datetime(1970, 1, 1),
-            ),
-            (
-                "user2",
-                "Max",
-                "Mustermann",
-                "[email protected]",
-                datetime(1970, 1, 1),
-            ),
-        )
-
-        transaction.set_autocommit(False)
-        cursor.executemany(query, query_list)
-        transaction.commit()
-        transaction.set_autocommit(True)
-
-    (event,) = events
-
-    # Ensure operation is persisted
-    assert User.objects.exists()
-
-    assert event["contexts"]["trace"]["origin"] == "manual"
-    assert event["spans"][0]["origin"] == "auto.db.django"
-
-    commit_spans = [
-        span
-        for span in event["spans"]
-        if span["data"].get(SPANDATA.DB_OPERATION) == DBOPERATION.COMMIT
-    ]
-    assert len(commit_spans) == 1
-    commit_span = commit_spans[0]
-    assert commit_span["origin"] == "auto.db.django"
-
-
-@pytest.mark.forked
-@pytest_mark_django_db_decorator(transaction=True)
-def test_db_atomic_execute(sentry_init, client, capture_events):
-    sentry_init(
-        integrations=[DjangoIntegration()],
-        send_default_pii=True,
-        traces_sample_rate=1.0,
-    )
-
-    if "postgres" not in connections:
-        pytest.skip("postgres tests disabled")
-
-    # trigger Django to open a new connection by marking the existing one as None.
-    connections["postgres"].connection = None
-
-    events = capture_events()
-
-    client.get(reverse("postgres_insert_orm_atomic"))
-
-    (event,) = events
-
-    # Ensure operation is persisted
-    assert User.objects.using("postgres").exists()
-
-    assert event["contexts"]["trace"]["origin"] == "auto.http.django"
-
-    commit_spans = [
-        span
-        for span in event["spans"]
-        if span["data"].get(SPANDATA.DB_OPERATION) == DBOPERATION.COMMIT
-    ]
-    assert len(commit_spans) == 1
-    commit_span = commit_spans[0]
-    assert commit_span["origin"] == "auto.db.django"
-
-
-@pytest.mark.forked
-@pytest_mark_django_db_decorator(transaction=True)
-def test_db_atomic_executemany(sentry_init, client, capture_events):
-    sentry_init(
-        integrations=[DjangoIntegration()],
-        send_default_pii=True,
-        traces_sample_rate=1.0,
-    )
-
-    if "postgres" not in connections:
-        pytest.skip("postgres tests disabled")
-
-    # trigger Django to open a new connection by marking the existing one as None.
-    connections["postgres"].connection = None
-
-    events = capture_events()
-
-    with start_transaction(name="test_transaction"):
-        with transaction.atomic():
-            cursor = connection.cursor()
-
-            query = """INSERT INTO auth_user (
-    password,
-    is_superuser,
-    username,
-    first_name,
-    last_name,
-    email,
-    is_staff,
-    is_active,
-    date_joined
-)
-VALUES ('password', false, %s, %s, %s, %s, false, true, %s);"""
-
-        query_list = (
-            (
-                "user1",
-                "John",
-                "Doe",
-                "[email protected]",
-                datetime(1970, 1, 1),
-            ),
-            (
-                "user2",
-                "Max",
-                "Mustermann",
-                "[email protected]",
-                datetime(1970, 1, 1),
-            ),
-        )
-        cursor.executemany(query, query_list)
-
-    (event,) = events
-
-    # Ensure operation is persisted
-    assert User.objects.exists()
-
-    assert event["contexts"]["trace"]["origin"] == "manual"
-
-    commit_spans = [
-        span
-        for span in event["spans"]
-        if span["data"].get(SPANDATA.DB_OPERATION) == DBOPERATION.COMMIT
-    ]
-    assert len(commit_spans) == 1
-    commit_span = commit_spans[0]
-    assert commit_span["origin"] == "auto.db.django"