Skip to content

Commit 41eb396

Browse files
alexander-alderman-webbalexander-alderman-webb
committed
.
2 parents 205cf24 + 485dc4a commit 41eb396

File tree

2 files changed

+25
-25
lines changed

2 files changed

+25
-25
lines changed

‎sentry_sdk/integrations/django/__init__.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -703,26 +703,26 @@ def _commit(self):
703703

704704
with sentry_sdk.start_span(
705705
op=OP.DB,
706-
name=SPANNAME.COMMIT,
706+
name=SPANNAME.DB_COMMIT,
707707
origin=DjangoIntegration.origin_db,
708708
) as span:
709-
_set_db_data(span, self, SPANNAME.COMMIT)
709+
_set_db_data(span, self, SPANNAME.DB_COMMIT)
710710
return real_commit(self)
711711

712712
@ensure_integration_enabled(DjangoIntegration, real_rollback)
713713
def _rollback(self):
714714
# type: (BaseDatabaseWrapper) -> None
715715
integration = sentry_sdk.get_client().get_integration(DjangoIntegration)
716716

717-
if integration is None or not integration.database_transaction_spans:
717+
if integration is None or not integration.db_transaction_spans:
718718
return real_rollback(self)
719719

720720
with sentry_sdk.start_span(
721721
op=OP.DB,
722-
name=SPANNAME.ROLLBACK,
722+
name=SPANNAME.DB_ROLLBACK,
723723
origin=DjangoIntegration.origin_db,
724724
) as span:
725-
_set_db_data(span, self, SPANNAME.ROLLBACK)
725+
_set_db_data(span, self, SPANNAME.DB_ROLLBACK)
726726
return real_rollback(self)
727727

728728
CursorWrapper.execute = execute

‎tests/integrations/django/test_db_transactions.py‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,8 @@ def test_db_transaction_spans_disabled_no_autocommit(
145145
sqlite_rollback["spans"],
146146
sqlite_commit["spans"],
147147
)
148-
if span["data"].get(SPANDATA.DB_OPERATION) == SPANNAME.COMMIT
149-
or span["data"].get(SPANDATA.DB_OPERATION) == SPANNAME.ROLLBACK
148+
if span["data"].get(SPANDATA.DB_OPERATION) == SPANNAME.DB_COMMIT
149+
or span["data"].get(SPANDATA.DB_OPERATION) == SPANNAME.DB_ROLLBACK
150150
]
151151
assert len(commit_spans) == 0
152152

@@ -263,8 +263,8 @@ def test_db_transaction_spans_disabled_atomic(sentry_init, client, capture_event
263263
sqlite_rollback["spans"],
264264
sqlite_commit["spans"],
265265
)
266-
if span["data"].get(SPANDATA.DB_OPERATION) == SPANNAME.COMMIT
267-
or span["data"].get(SPANDATA.DB_OPERATION) == SPANNAME.ROLLBACK
266+
if span["data"].get(SPANDATA.DB_OPERATION) == SPANNAME.DB_COMMIT
267+
or span["data"].get(SPANDATA.DB_OPERATION) == SPANNAME.DB_ROLLBACK
268268
]
269269
assert len(commit_spans) == 0
270270

@@ -297,7 +297,7 @@ def test_db_no_autocommit_execute(sentry_init, client, capture_events):
297297
commit_spans = [
298298
span
299299
for span in event["spans"]
300-
if span["data"].get(SPANDATA.DB_OPERATION) == SPANNAME.COMMIT
300+
if span["data"].get(SPANDATA.DB_OPERATION) == SPANNAME.DB_COMMIT
301301
]
302302
assert len(commit_spans) == 1
303303
commit_span = commit_spans[0]
@@ -388,7 +388,7 @@ def test_db_no_autocommit_executemany(sentry_init, client, capture_events):
388388
commit_spans = [
389389
span
390390
for span in event["spans"]
391-
if span["data"].get(SPANDATA.DB_OPERATION) == SPANNAME.COMMIT
391+
if span["data"].get(SPANDATA.DB_OPERATION) == SPANNAME.DB_COMMIT
392392
]
393393
assert len(commit_spans) == 1
394394
commit_span = commit_spans[0]
@@ -415,7 +415,7 @@ def test_db_no_autocommit_executemany(sentry_init, client, capture_events):
415415
@pytest_mark_django_db_decorator(transaction=True)
416416
def test_db_no_autocommit_rollback_execute(sentry_init, client, capture_events):
417417
sentry_init(
418-
integrations=[DjangoIntegration(database_transaction_spans=True)],
418+
integrations=[DjangoIntegration(db_transaction_spans=True)],
419419
traces_sample_rate=1.0,
420420
)
421421

@@ -439,7 +439,7 @@ def test_db_no_autocommit_rollback_execute(sentry_init, client, capture_events):
439439
rollback_spans = [
440440
span
441441
for span in event["spans"]
442-
if span["data"].get(SPANDATA.DB_OPERATION) == SPANNAME.ROLLBACK
442+
if span["data"].get(SPANDATA.DB_OPERATION) == SPANNAME.DB_ROLLBACK
443443
]
444444
assert len(rollback_spans) == 1
445445
rollback_span = rollback_spans[0]
@@ -473,7 +473,7 @@ def test_db_no_autocommit_rollback_execute(sentry_init, client, capture_events):
473473
@pytest_mark_django_db_decorator(transaction=True)
474474
def test_db_no_autocommit_rollback_executemany(sentry_init, client, capture_events):
475475
sentry_init(
476-
integrations=[DjangoIntegration(database_transaction_spans=True)],
476+
integrations=[DjangoIntegration(db_transaction_spans=True)],
477477
traces_sample_rate=1.0,
478478
)
479479

@@ -530,7 +530,7 @@ def test_db_no_autocommit_rollback_executemany(sentry_init, client, capture_even
530530
rollback_spans = [
531531
span
532532
for span in event["spans"]
533-
if span["data"].get(SPANDATA.DB_OPERATION) == SPANNAME.ROLLBACK
533+
if span["data"].get(SPANDATA.DB_OPERATION) == SPANNAME.DB_ROLLBACK
534534
]
535535
assert len(rollback_spans) == 1
536536
rollback_span = rollback_spans[0]
@@ -581,7 +581,7 @@ def test_db_atomic_execute(sentry_init, client, capture_events):
581581
commit_spans = [
582582
span
583583
for span in event["spans"]
584-
if span["data"].get(SPANDATA.DB_OPERATION) == SPANNAME.COMMIT
584+
if span["data"].get(SPANDATA.DB_OPERATION) == SPANNAME.DB_COMMIT
585585
]
586586
assert len(commit_spans) == 1
587587
commit_span = commit_spans[0]
@@ -669,7 +669,7 @@ def test_db_atomic_executemany(sentry_init, client, capture_events):
669669
commit_spans = [
670670
span
671671
for span in event["spans"]
672-
if span["data"].get(SPANDATA.DB_OPERATION) == SPANNAME.COMMIT
672+
if span["data"].get(SPANDATA.DB_OPERATION) == SPANNAME.DB_COMMIT
673673
]
674674
assert len(commit_spans) == 1
675675
commit_span = commit_spans[0]
@@ -696,7 +696,7 @@ def test_db_atomic_executemany(sentry_init, client, capture_events):
696696
@pytest_mark_django_db_decorator(transaction=True)
697697
def test_db_atomic_rollback_execute(sentry_init, client, capture_events):
698698
sentry_init(
699-
integrations=[DjangoIntegration(database_transaction_spans=True)],
699+
integrations=[DjangoIntegration(db_transaction_spans=True)],
700700
send_default_pii=True,
701701
traces_sample_rate=1.0,
702702
)
@@ -721,7 +721,7 @@ def test_db_atomic_rollback_execute(sentry_init, client, capture_events):
721721
rollback_spans = [
722722
span
723723
for span in event["spans"]
724-
if span["data"].get(SPANDATA.DB_OPERATION) == SPANNAME.ROLLBACK
724+
if span["data"].get(SPANDATA.DB_OPERATION) == SPANNAME.DB_ROLLBACK
725725
]
726726
assert len(rollback_spans) == 1
727727
rollback_span = rollback_spans[0]
@@ -755,7 +755,7 @@ def test_db_atomic_rollback_execute(sentry_init, client, capture_events):
755755
@pytest_mark_django_db_decorator(transaction=True)
756756
def test_db_atomic_rollback_executemany(sentry_init, client, capture_events):
757757
sentry_init(
758-
integrations=[DjangoIntegration(database_transaction_spans=True)],
758+
integrations=[DjangoIntegration(db_transaction_spans=True)],
759759
send_default_pii=True,
760760
traces_sample_rate=1.0,
761761
)
@@ -810,7 +810,7 @@ def test_db_atomic_rollback_executemany(sentry_init, client, capture_events):
810810
rollback_spans = [
811811
span
812812
for span in event["spans"]
813-
if span["data"].get(SPANDATA.DB_OPERATION) == SPANNAME.ROLLBACK
813+
if span["data"].get(SPANDATA.DB_OPERATION) == SPANNAME.DB_ROLLBACK
814814
]
815815
assert len(rollback_spans) == 1
816816
rollback_span = rollback_spans[0]
@@ -837,7 +837,7 @@ def test_db_atomic_rollback_executemany(sentry_init, client, capture_events):
837837
@pytest_mark_django_db_decorator(transaction=True)
838838
def test_db_atomic_execute_exception(sentry_init, client, capture_events):
839839
sentry_init(
840-
integrations=[DjangoIntegration(database_transaction_spans=True)],
840+
integrations=[DjangoIntegration(db_transaction_spans=True)],
841841
send_default_pii=True,
842842
traces_sample_rate=1.0,
843843
)
@@ -862,7 +862,7 @@ def test_db_atomic_execute_exception(sentry_init, client, capture_events):
862862
rollback_spans = [
863863
span
864864
for span in event["spans"]
865-
if span["data"].get(SPANDATA.DB_OPERATION) == SPANNAME.ROLLBACK
865+
if span["data"].get(SPANDATA.DB_OPERATION) == SPANNAME.DB_ROLLBACK
866866
]
867867
assert len(rollback_spans) == 1
868868
rollback_span = rollback_spans[0]
@@ -896,7 +896,7 @@ def test_db_atomic_execute_exception(sentry_init, client, capture_events):
896896
@pytest_mark_django_db_decorator(transaction=True)
897897
def test_db_atomic_executemany_exception(sentry_init, client, capture_events):
898898
sentry_init(
899-
integrations=[DjangoIntegration(database_transaction_spans=True)],
899+
integrations=[DjangoIntegration(db_transaction_spans=True)],
900900
send_default_pii=True,
901901
traces_sample_rate=1.0,
902902
)
@@ -954,7 +954,7 @@ def test_db_atomic_executemany_exception(sentry_init, client, capture_events):
954954
rollback_spans = [
955955
span
956956
for span in event["spans"]
957-
if span["data"].get(SPANDATA.DB_OPERATION) == SPANNAME.ROLLBACK
957+
if span["data"].get(SPANDATA.DB_OPERATION) == SPANNAME.DB_ROLLBACK
958958
]
959959
assert len(rollback_spans) == 1
960960
rollback_span = rollback_spans[0]

0 commit comments

Comments
 (0)