Skip to content

Commit b9b02e6

Browse files
sentrivanasentrivana
committed
fixes
1 parent cd22cbd commit b9b02e6

File tree

2 files changed

+24
-20
lines changed

2 files changed

+24
-20
lines changed

‎sentry_sdk/integrations/clickhouse_driver.py‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import json
2+
13
import sentry_sdk
24
from sentry_sdk.consts import OP, SPANDATA
35
from sentry_sdk.integrations import Integration, DidNotEnable
@@ -92,13 +94,13 @@ def _inner(*args: P.args, **kwargs: P.kwargs) -> T:
9294
_set_db_data(span, connection)
9395

9496
if should_send_default_pii():
95-
span.set_data("db.query.text", query)
97+
span.set_attribute("db.query.text", query)
9698

9799
if query_id:
98-
span.set_data("db.query_id", query_id)
100+
span.set_attribute("db.query_id", query_id)
99101

100102
if params and should_send_default_pii():
101-
span.set_data("db.params", str(params))
103+
span.set_attribute("db.params", json.dumps(params))
102104

103105
# run the original code
104106
ret = f(*args, **kwargs)
@@ -116,7 +118,7 @@ def _inner_end(*args: P.args, **kwargs: P.kwargs) -> T:
116118

117119
if span is not None:
118120
if res is not None and should_send_default_pii():
119-
span.set_data("db.result", str(res))
121+
span.set_attribute("db.result", str(res))
120122

121123
with capture_internal_exceptions():
122124
query = span.get_attribute("db.query.text")
@@ -155,9 +157,9 @@ def _inner_send_data(*args: P.args, **kwargs: P.kwargs) -> T:
155157
_set_db_data(span, instance.connection)
156158

157159
if should_send_default_pii():
158-
db_params = span.get_attribute("db.params") or []
160+
db_params = json.loads(span.get_attribute("db.params") or "[]")
159161
db_params.extend(data)
160-
span.set_data("db.params", db_params)
162+
span.set_attribute("db.params", json.dumps(db_params))
161163

162164
return f(*args, **kwargs)
163165

@@ -167,8 +169,8 @@ def _inner_send_data(*args: P.args, **kwargs: P.kwargs) -> T:
167169
def _set_db_data(
168170
span: Span, connection: clickhouse_driver.connection.Connection
169171
) -> None:
170-
span.set_data(SPANDATA.DB_SYSTEM, "clickhouse")
171-
span.set_data(SPANDATA.SERVER_ADDRESS, connection.host)
172-
span.set_data(SPANDATA.SERVER_PORT, connection.port)
173-
span.set_data(SPANDATA.DB_NAME, connection.database)
174-
span.set_data(SPANDATA.DB_USER, connection.user)
172+
span.set_attribute(SPANDATA.DB_SYSTEM, "clickhouse")
173+
span.set_attribute(SPANDATA.SERVER_ADDRESS, connection.host)
174+
span.set_attribute(SPANDATA.SERVER_PORT, connection.port)
175+
span.set_attribute(SPANDATA.DB_NAME, connection.database)
176+
span.set_attribute(SPANDATA.DB_USER, connection.user)

‎tests/integrations/clickhouse_driver/test_clickhouse_driver.py‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
```
66
"""
77

8+
import json
9+
810
import clickhouse_driver
911
from clickhouse_driver import Client, connect
1012

@@ -181,7 +183,7 @@ def test_clickhouse_client_breadcrumbs_with_pii(sentry_init, capture_events) ->
181183
"db.user": "default",
182184
"server.address": "localhost",
183185
"server.port": 9000,
184-
"db.params": str([[170], [200]]),
186+
"db.params": json.dumps([[170], [200]]),
185187
},
186188
"message": "INSERT INTO test (x) VALUES",
187189
"type": "default",
@@ -430,7 +432,7 @@ def test_clickhouse_client_spans_with_pii(
430432
"db.name": "",
431433
"db.user": "default",
432434
"db.query.text": "INSERT INTO test (x) VALUES",
433-
"db.params": str([{"x": 100}]),
435+
"db.params": json.dumps([{"x": 100}]),
434436
"server.address": "localhost",
435437
"server.port": 9000,
436438
},
@@ -466,7 +468,7 @@ def test_clickhouse_client_spans_with_pii(
466468
"db.system": "clickhouse",
467469
"db.name": "",
468470
"db.user": "default",
469-
"db.params": str({"minv": 150}),
471+
"db.params": json.dumps({"minv": 150}),
470472
"db.query.text": "SELECT sum(x) FROM test WHERE x > 150",
471473
"db.result": str([(370,)]),
472474
"server.address": "localhost",
@@ -646,7 +648,7 @@ def test_clickhouse_dbapi_breadcrumbs_with_pii(sentry_init, capture_events) -> N
646648
"db.user": "default",
647649
"server.address": "localhost",
648650
"server.port": 9000,
649-
"db.params": str([{"x": 100}]),
651+
"db.params": json.dumps([{"x": 100}]),
650652
},
651653
"message": "INSERT INTO test (x) VALUES",
652654
"type": "default",
@@ -659,7 +661,7 @@ def test_clickhouse_dbapi_breadcrumbs_with_pii(sentry_init, capture_events) -> N
659661
"db.user": "default",
660662
"server.address": "localhost",
661663
"server.port": 9000,
662-
"db.params": str([[170], [200]]),
664+
"db.params": json.dumps([[170], [200]]),
663665
},
664666
"message": "INSERT INTO test (x) VALUES",
665667
"type": "default",
@@ -672,7 +674,7 @@ def test_clickhouse_dbapi_breadcrumbs_with_pii(sentry_init, capture_events) -> N
672674
"db.user": "default",
673675
"server.address": "localhost",
674676
"server.port": 9000,
675-
"db.params": str({"minv": 150}),
677+
"db.params": json.dumps({"minv": 150}),
676678
"db.result": str([[["370"]], [["'sum(x)'", "'Int64'"]]]),
677679
},
678680
"message": "SELECT sum(x) FROM test WHERE x > 150",
@@ -905,7 +907,7 @@ def test_clickhouse_dbapi_spans_with_pii(
905907
"db.name": "",
906908
"db.user": "default",
907909
"db.query.text": "INSERT INTO test (x) VALUES",
908-
"db.params": str([{"x": 100}]),
910+
"db.params": json.dumps([{"x": 100}]),
909911
"server.address": "localhost",
910912
"server.port": 9000,
911913
},
@@ -924,7 +926,7 @@ def test_clickhouse_dbapi_spans_with_pii(
924926
"db.name": "",
925927
"db.user": "default",
926928
"db.query.text": "INSERT INTO test (x) VALUES",
927-
"db.params": str([[170], [200]]),
929+
"db.params": json.dumps([[170], [200]]),
928930
"server.address": "localhost",
929931
"server.port": 9000,
930932
},
@@ -943,7 +945,7 @@ def test_clickhouse_dbapi_spans_with_pii(
943945
"db.name": "",
944946
"db.user": "default",
945947
"db.query.text": "SELECT sum(x) FROM test WHERE x > 150",
946-
"db.params": str({"minv": 150}),
948+
"db.params": json.dumps({"minv": 150}),
947949
"db.result": str(([(370,)], [("sum(x)", "Int64")])),
948950
"server.address": "localhost",
949951
"server.port": 9000,

0 commit comments

Comments
 (0)