Skip to content

Commit 5ef5f95

Browse files
sentrivanasentrivana
committed
.
1 parent 22abc0b commit 5ef5f95

File tree

6 files changed

+75
-75
lines changed

6 files changed

+75
-75
lines changed

‎sentry_sdk/integrations/pymongo.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ def started(self, event):
158158

159159
with capture_internal_exceptions():
160160
sentry_sdk.add_breadcrumb(
161-
message=query, category="query", type=OP.DB_QUERY, data=data
161+
message=query, category="query", type="query", data=data
162162
)
163163

164164
for key, value in data.items():

‎tests/integrations/clickhouse_driver/test_clickhouse_driver.py‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -252,13 +252,13 @@ def test_clickhouse_client_spans(
252252

253253
expected_spans = [
254254
{
255-
"op": "db",
255+
"op": "db.query",
256256
"origin": "auto.db.clickhouse_driver",
257257
"description": "DROP TABLE IF EXISTS test",
258258
"data": {
259259
"sentry.name": "DROP TABLE IF EXISTS test",
260260
"sentry.origin": "auto.db.clickhouse_driver",
261-
"sentry.op": "db",
261+
"sentry.op": "db.query",
262262
"db.system": "clickhouse",
263263
"db.name": "",
264264
"db.user": "default",
@@ -269,13 +269,13 @@ def test_clickhouse_client_spans(
269269
"parent_span_id": transaction_span_id,
270270
},
271271
{
272-
"op": "db",
272+
"op": "db.query",
273273
"origin": "auto.db.clickhouse_driver",
274274
"description": "CREATE TABLE test (x Int32) ENGINE = Memory",
275275
"data": {
276276
"sentry.name": "CREATE TABLE test (x Int32) ENGINE = Memory",
277277
"sentry.origin": "auto.db.clickhouse_driver",
278-
"sentry.op": "db",
278+
"sentry.op": "db.query",
279279
"db.system": "clickhouse",
280280
"db.name": "",
281281
"db.user": "default",
@@ -286,13 +286,13 @@ def test_clickhouse_client_spans(
286286
"parent_span_id": transaction_span_id,
287287
},
288288
{
289-
"op": "db",
289+
"op": "db.query",
290290
"origin": "auto.db.clickhouse_driver",
291291
"description": "INSERT INTO test (x) VALUES",
292292
"data": {
293293
"sentry.name": "INSERT INTO test (x) VALUES",
294294
"sentry.origin": "auto.db.clickhouse_driver",
295-
"sentry.op": "db",
295+
"sentry.op": "db.query",
296296
"db.system": "clickhouse",
297297
"db.name": "",
298298
"db.user": "default",
@@ -303,13 +303,13 @@ def test_clickhouse_client_spans(
303303
"parent_span_id": transaction_span_id,
304304
},
305305
{
306-
"op": "db",
306+
"op": "db.query",
307307
"origin": "auto.db.clickhouse_driver",
308308
"description": "INSERT INTO test (x) VALUES",
309309
"data": {
310310
"sentry.name": "INSERT INTO test (x) VALUES",
311311
"sentry.origin": "auto.db.clickhouse_driver",
312-
"sentry.op": "db",
312+
"sentry.op": "db.query",
313313
"db.system": "clickhouse",
314314
"db.name": "",
315315
"db.user": "default",
@@ -320,13 +320,13 @@ def test_clickhouse_client_spans(
320320
"parent_span_id": transaction_span_id,
321321
},
322322
{
323-
"op": "db",
323+
"op": "db.query",
324324
"origin": "auto.db.clickhouse_driver",
325325
"description": "SELECT sum(x) FROM test WHERE x > 150",
326326
"data": {
327327
"sentry.name": "SELECT sum(x) FROM test WHERE x > 150",
328328
"sentry.origin": "auto.db.clickhouse_driver",
329-
"sentry.op": "db",
329+
"sentry.op": "db.query",
330330
"db.system": "clickhouse",
331331
"db.name": "",
332332
"db.user": "default",
@@ -385,13 +385,13 @@ def test_clickhouse_client_spans_with_pii(sentry_init, capture_events) -> None:
385385

386386
expected_spans = [
387387
{
388-
"op": "db",
388+
"op": "db.query",
389389
"origin": "auto.db.clickhouse_driver",
390390
"description": "DROP TABLE IF EXISTS test",
391391
"data": {
392392
"sentry.name": "DROP TABLE IF EXISTS test",
393393
"sentry.origin": "auto.db.clickhouse_driver",
394-
"sentry.op": "db",
394+
"sentry.op": "db.query",
395395
"db.system": "clickhouse",
396396
"db.name": "",
397397
"db.user": "default",
@@ -404,13 +404,13 @@ def test_clickhouse_client_spans_with_pii(sentry_init, capture_events) -> None:
404404
"parent_span_id": transaction_span_id,
405405
},
406406
{
407-
"op": "db",
407+
"op": "db.query",
408408
"origin": "auto.db.clickhouse_driver",
409409
"description": "CREATE TABLE test (x Int32) ENGINE = Memory",
410410
"data": {
411411
"sentry.name": "CREATE TABLE test (x Int32) ENGINE = Memory",
412412
"sentry.origin": "auto.db.clickhouse_driver",
413-
"sentry.op": "db",
413+
"sentry.op": "db.query",
414414
"db.system": "clickhouse",
415415
"db.name": "",
416416
"db.user": "default",
@@ -423,13 +423,13 @@ def test_clickhouse_client_spans_with_pii(sentry_init, capture_events) -> None:
423423
"parent_span_id": transaction_span_id,
424424
},
425425
{
426-
"op": "db",
426+
"op": "db.query",
427427
"origin": "auto.db.clickhouse_driver",
428428
"description": "INSERT INTO test (x) VALUES",
429429
"data": {
430430
"sentry.name": "INSERT INTO test (x) VALUES",
431431
"sentry.origin": "auto.db.clickhouse_driver",
432-
"sentry.op": "db",
432+
"sentry.op": "db.query",
433433
"db.system": "clickhouse",
434434
"db.name": "",
435435
"db.user": "default",
@@ -442,13 +442,13 @@ def test_clickhouse_client_spans_with_pii(sentry_init, capture_events) -> None:
442442
"parent_span_id": transaction_span_id,
443443
},
444444
{
445-
"op": "db",
445+
"op": "db.query",
446446
"origin": "auto.db.clickhouse_driver",
447447
"description": "INSERT INTO test (x) VALUES",
448448
"data": {
449449
"sentry.name": "INSERT INTO test (x) VALUES",
450450
"sentry.origin": "auto.db.clickhouse_driver",
451-
"sentry.op": "db",
451+
"sentry.op": "db.query",
452452
"db.system": "clickhouse",
453453
"db.name": "",
454454
"db.user": "default",
@@ -460,13 +460,13 @@ def test_clickhouse_client_spans_with_pii(sentry_init, capture_events) -> None:
460460
"parent_span_id": transaction_span_id,
461461
},
462462
{
463-
"op": "db",
463+
"op": "db.query",
464464
"origin": "auto.db.clickhouse_driver",
465465
"description": "SELECT sum(x) FROM test WHERE x > 150",
466466
"data": {
467467
"sentry.name": "SELECT sum(x) FROM test WHERE x > 150",
468468
"sentry.origin": "auto.db.clickhouse_driver",
469-
"sentry.op": "db",
469+
"sentry.op": "db.query",
470470
"db.system": "clickhouse",
471471
"db.name": "",
472472
"db.user": "default",
@@ -726,13 +726,13 @@ def test_clickhouse_dbapi_spans(sentry_init, capture_events, capture_envelopes)
726726

727727
expected_spans = [
728728
{
729-
"op": "db",
729+
"op": "db.query",
730730
"origin": "auto.db.clickhouse_driver",
731731
"description": "DROP TABLE IF EXISTS test",
732732
"data": {
733733
"sentry.name": "DROP TABLE IF EXISTS test",
734734
"sentry.origin": "auto.db.clickhouse_driver",
735-
"sentry.op": "db",
735+
"sentry.op": "db.query",
736736
"db.system": "clickhouse",
737737
"db.name": "",
738738
"db.user": "default",
@@ -743,13 +743,13 @@ def test_clickhouse_dbapi_spans(sentry_init, capture_events, capture_envelopes)
743743
"parent_span_id": transaction_span_id,
744744
},
745745
{
746-
"op": "db",
746+
"op": "db.query",
747747
"origin": "auto.db.clickhouse_driver",
748748
"description": "CREATE TABLE test (x Int32) ENGINE = Memory",
749749
"data": {
750750
"sentry.name": "CREATE TABLE test (x Int32) ENGINE = Memory",
751751
"sentry.origin": "auto.db.clickhouse_driver",
752-
"sentry.op": "db",
752+
"sentry.op": "db.query",
753753
"db.system": "clickhouse",
754754
"db.name": "",
755755
"db.user": "default",
@@ -760,13 +760,13 @@ def test_clickhouse_dbapi_spans(sentry_init, capture_events, capture_envelopes)
760760
"parent_span_id": transaction_span_id,
761761
},
762762
{
763-
"op": "db",
763+
"op": "db.query",
764764
"origin": "auto.db.clickhouse_driver",
765765
"description": "INSERT INTO test (x) VALUES",
766766
"data": {
767767
"sentry.name": "INSERT INTO test (x) VALUES",
768768
"sentry.origin": "auto.db.clickhouse_driver",
769-
"sentry.op": "db",
769+
"sentry.op": "db.query",
770770
"db.system": "clickhouse",
771771
"db.name": "",
772772
"db.user": "default",
@@ -777,13 +777,13 @@ def test_clickhouse_dbapi_spans(sentry_init, capture_events, capture_envelopes)
777777
"parent_span_id": transaction_span_id,
778778
},
779779
{
780-
"op": "db",
780+
"op": "db.query",
781781
"origin": "auto.db.clickhouse_driver",
782782
"description": "INSERT INTO test (x) VALUES",
783783
"data": {
784784
"sentry.name": "INSERT INTO test (x) VALUES",
785785
"sentry.origin": "auto.db.clickhouse_driver",
786-
"sentry.op": "db",
786+
"sentry.op": "db.query",
787787
"db.system": "clickhouse",
788788
"db.name": "",
789789
"db.user": "default",
@@ -794,13 +794,13 @@ def test_clickhouse_dbapi_spans(sentry_init, capture_events, capture_envelopes)
794794
"parent_span_id": transaction_span_id,
795795
},
796796
{
797-
"op": "db",
797+
"op": "db.query",
798798
"origin": "auto.db.clickhouse_driver",
799799
"description": "SELECT sum(x) FROM test WHERE x > 150",
800800
"data": {
801801
"sentry.name": "SELECT sum(x) FROM test WHERE x > 150",
802802
"sentry.origin": "auto.db.clickhouse_driver",
803-
"sentry.op": "db",
803+
"sentry.op": "db.query",
804804
"db.system": "clickhouse",
805805
"db.name": "",
806806
"db.user": "default",
@@ -860,13 +860,13 @@ def test_clickhouse_dbapi_spans_with_pii(
860860

861861
expected_spans = [
862862
{
863-
"op": "db",
863+
"op": "db.query",
864864
"origin": "auto.db.clickhouse_driver",
865865
"description": "DROP TABLE IF EXISTS test",
866866
"data": {
867867
"sentry.name": "DROP TABLE IF EXISTS test",
868868
"sentry.origin": "auto.db.clickhouse_driver",
869-
"sentry.op": "db",
869+
"sentry.op": "db.query",
870870
"db.system": "clickhouse",
871871
"db.name": "",
872872
"db.user": "default",
@@ -879,13 +879,13 @@ def test_clickhouse_dbapi_spans_with_pii(
879879
"parent_span_id": transaction_span_id,
880880
},
881881
{
882-
"op": "db",
882+
"op": "db.query",
883883
"origin": "auto.db.clickhouse_driver",
884884
"description": "CREATE TABLE test (x Int32) ENGINE = Memory",
885885
"data": {
886886
"sentry.name": "CREATE TABLE test (x Int32) ENGINE = Memory",
887887
"sentry.origin": "auto.db.clickhouse_driver",
888-
"sentry.op": "db",
888+
"sentry.op": "db.query",
889889
"db.system": "clickhouse",
890890
"db.name": "",
891891
"db.user": "default",
@@ -898,13 +898,13 @@ def test_clickhouse_dbapi_spans_with_pii(
898898
"parent_span_id": transaction_span_id,
899899
},
900900
{
901-
"op": "db",
901+
"op": "db.query",
902902
"origin": "auto.db.clickhouse_driver",
903903
"description": "INSERT INTO test (x) VALUES",
904904
"data": {
905905
"sentry.name": "INSERT INTO test (x) VALUES",
906906
"sentry.origin": "auto.db.clickhouse_driver",
907-
"sentry.op": "db",
907+
"sentry.op": "db.query",
908908
"db.system": "clickhouse",
909909
"db.name": "",
910910
"db.user": "default",
@@ -917,13 +917,13 @@ def test_clickhouse_dbapi_spans_with_pii(
917917
"parent_span_id": transaction_span_id,
918918
},
919919
{
920-
"op": "db",
920+
"op": "db.query",
921921
"origin": "auto.db.clickhouse_driver",
922922
"description": "INSERT INTO test (x) VALUES",
923923
"data": {
924924
"sentry.name": "INSERT INTO test (x) VALUES",
925925
"sentry.origin": "auto.db.clickhouse_driver",
926-
"sentry.op": "db",
926+
"sentry.op": "db.query",
927927
"db.system": "clickhouse",
928928
"db.name": "",
929929
"db.user": "default",
@@ -936,13 +936,13 @@ def test_clickhouse_dbapi_spans_with_pii(
936936
"parent_span_id": transaction_span_id,
937937
},
938938
{
939-
"op": "db",
939+
"op": "db.query",
940940
"origin": "auto.db.clickhouse_driver",
941941
"description": "SELECT sum(x) FROM test WHERE x > 150",
942942
"data": {
943943
"sentry.name": "SELECT sum(x) FROM test WHERE x > 150",
944944
"sentry.origin": "auto.db.clickhouse_driver",
945-
"sentry.op": "db",
945+
"sentry.op": "db.query",
946946
"db.system": "clickhouse",
947947
"db.name": "",
948948
"db.user": "default",

‎tests/integrations/django/test_basic.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -570,11 +570,11 @@ def test_django_connect_trace(sentry_init, client, capture_events, render_span_t
570570
(event,) = events
571571

572572
for span in event["spans"]:
573-
if span.get("op") == "db":
573+
if span.get("op") == "db.query":
574574
data = span.get("data")
575575
assert data.get(SPANDATA.DB_SYSTEM) == "postgresql"
576576

577-
assert '- op="db": description="connect"' in render_span_tree(event)
577+
assert '- op="db.query": description="connect"' in render_span_tree(event)
578578

579579

580580
@pytest.mark.forked
@@ -639,7 +639,7 @@ def test_db_connection_span_data(sentry_init, client, capture_events):
639639
(event,) = events
640640

641641
for span in event["spans"]:
642-
if span.get("op") == "db":
642+
if span.get("op") == "db.query":
643643
data = span.get("data")
644644
assert data.get(SPANDATA.DB_SYSTEM) == "postgresql"
645645
conn_params = connections["postgres"].get_connection_params()

0 commit comments

Comments
 (0)