Skip to content

Commit 3dd6bc0

Browse files
alexander-alderman-webbalexander-alderman-webb
committed
.
1 parent b9fe91b commit 3dd6bc0

2 files changed

Lines changed: 49 additions & 48 deletions

File tree

‎sentry_sdk/integrations/clickhouse_driver.py‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -193,15 +193,16 @@ def wrapped_generator() -> "Iterator[Any]":
193193
def _set_db_data(span: "Union[Span, StreamedSpan]", connection: "Connection") -> None:
194194
if isinstance(span, StreamedSpan):
195195
span.set_attribute(SPANDATA.DB_SYSTEM_NAME, "clickhouse")
196-
span.set_attribute(SPANDATA.DB_DRIVER_NAME, "clickhouse-driver")
197-
span.set_attribute(SPANDATA.SERVER_ADDRESS, connection.host)
198-
span.set_attribute(SPANDATA.SERVER_PORT, connection.port)
199196
span.set_attribute(SPANDATA.DB_NAMESPACE, connection.database)
200-
span.set_attribute(SPANDATA.DB_USER, connection.user)
197+
198+
set_on_span = span.set_attribute
201199
else:
202200
span.set_data(SPANDATA.DB_SYSTEM, "clickhouse")
203-
span.set_data(SPANDATA.DB_DRIVER_NAME, "clickhouse-driver")
204-
span.set_data(SPANDATA.SERVER_ADDRESS, connection.host)
205-
span.set_data(SPANDATA.SERVER_PORT, connection.port)
206201
span.set_data(SPANDATA.DB_NAME, connection.database)
207-
span.set_data(SPANDATA.DB_USER, connection.user)
202+
203+
set_on_span = span.set_data
204+
205+
set_on_span(SPANDATA.DB_DRIVER_NAME, "clickhouse-driver")
206+
set_on_span(SPANDATA.SERVER_ADDRESS, connection.host)
207+
set_on_span(SPANDATA.SERVER_PORT, connection.port)
208+
set_on_span(SPANDATA.DB_USER, connection.user)

‎tests/integrations/clickhouse_driver/test_clickhouse_driver.py‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -273,9 +273,9 @@ def test_clickhouse_client_spans(
273273
{
274274
"name": "DROP TABLE IF EXISTS test",
275275
"attributes": {
276-
"db.system": "clickhouse",
276+
"db.system.name": "clickhouse",
277277
"db.driver.name": "clickhouse-driver",
278-
"db.name": "",
278+
"db.namespace": "",
279279
"db.user": "default",
280280
"sentry.op": "db",
281281
"sentry.origin": "auto.db.clickhouse_driver",
@@ -288,9 +288,9 @@ def test_clickhouse_client_spans(
288288
{
289289
"name": "CREATE TABLE test (x Int32) ENGINE = Memory",
290290
"attributes": {
291-
"db.system": "clickhouse",
291+
"db.system.name": "clickhouse",
292292
"db.driver.name": "clickhouse-driver",
293-
"db.name": "",
293+
"db.namespace": "",
294294
"db.user": "default",
295295
"sentry.op": "db",
296296
"sentry.origin": "auto.db.clickhouse_driver",
@@ -303,9 +303,9 @@ def test_clickhouse_client_spans(
303303
{
304304
"name": "INSERT INTO test (x) VALUES",
305305
"attributes": {
306-
"db.system": "clickhouse",
306+
"db.system.name": "clickhouse",
307307
"db.driver.name": "clickhouse-driver",
308-
"db.name": "",
308+
"db.namespace": "",
309309
"db.user": "default",
310310
"sentry.op": "db",
311311
"sentry.origin": "auto.db.clickhouse_driver",
@@ -318,9 +318,9 @@ def test_clickhouse_client_spans(
318318
{
319319
"name": "INSERT INTO test (x) VALUES",
320320
"attributes": {
321-
"db.system": "clickhouse",
321+
"db.system.name": "clickhouse",
322322
"db.driver.name": "clickhouse-driver",
323-
"db.name": "",
323+
"db.namespace": "",
324324
"db.user": "default",
325325
"sentry.op": "db",
326326
"sentry.origin": "auto.db.clickhouse_driver",
@@ -333,9 +333,9 @@ def test_clickhouse_client_spans(
333333
{
334334
"name": "SELECT sum(x) FROM test WHERE x > 150",
335335
"attributes": {
336-
"db.system": "clickhouse",
336+
"db.system.name": "clickhouse",
337337
"db.driver.name": "clickhouse-driver",
338-
"db.name": "",
338+
"db.namespace": "",
339339
"db.user": "default",
340340
"sentry.op": "db",
341341
"sentry.origin": "auto.db.clickhouse_driver",
@@ -560,8 +560,8 @@ def test_clickhouse_client_spans_with_pii(
560560
{
561561
"name": "DROP TABLE IF EXISTS test",
562562
"attributes": {
563-
"db.system": "clickhouse",
564-
"db.name": "",
563+
"db.system.name": "clickhouse",
564+
"db.namespace": "",
565565
"db.user": "default",
566566
"server.address": "localhost",
567567
"server.port": 9000,
@@ -574,8 +574,8 @@ def test_clickhouse_client_spans_with_pii(
574574
{
575575
"name": "CREATE TABLE test (x Int32) ENGINE = Memory",
576576
"attributes": {
577-
"db.system": "clickhouse",
578-
"db.name": "",
577+
"db.system.name": "clickhouse",
578+
"db.namespace": "",
579579
"db.user": "default",
580580
"server.address": "localhost",
581581
"server.port": 9000,
@@ -588,8 +588,8 @@ def test_clickhouse_client_spans_with_pii(
588588
{
589589
"name": "INSERT INTO test (x) VALUES",
590590
"attributes": {
591-
"db.system": "clickhouse",
592-
"db.name": "",
591+
"db.system.name": "clickhouse",
592+
"db.namespace": "",
593593
"db.user": "default",
594594
"server.address": "localhost",
595595
"server.port": 9000,
@@ -602,8 +602,8 @@ def test_clickhouse_client_spans_with_pii(
602602
{
603603
"name": "INSERT INTO test (x) VALUES",
604604
"attributes": {
605-
"db.system": "clickhouse",
606-
"db.name": "",
605+
"db.system.name": "clickhouse",
606+
"db.namespace": "",
607607
"db.user": "default",
608608
"server.address": "localhost",
609609
"server.port": 9000,
@@ -614,8 +614,8 @@ def test_clickhouse_client_spans_with_pii(
614614
{
615615
"name": "SELECT sum(x) FROM test WHERE x > 150",
616616
"attributes": {
617-
"db.system": "clickhouse",
618-
"db.name": "",
617+
"db.system.name": "clickhouse",
618+
"db.namespace": "",
619619
"db.user": "default",
620620
"server.address": "localhost",
621621
"server.port": 9000,
@@ -1008,9 +1008,9 @@ def test_clickhouse_dbapi_spans(
10081008
{
10091009
"name": "DROP TABLE IF EXISTS test",
10101010
"attributes": {
1011-
"db.system": "clickhouse",
1011+
"db.system.name": "clickhouse",
10121012
"db.driver.name": "clickhouse-driver",
1013-
"db.name": "",
1013+
"db.namespace": "",
10141014
"db.user": "default",
10151015
"sentry.op": "db",
10161016
"sentry.origin": "auto.db.clickhouse_driver",
@@ -1023,9 +1023,9 @@ def test_clickhouse_dbapi_spans(
10231023
{
10241024
"name": "CREATE TABLE test (x Int32) ENGINE = Memory",
10251025
"attributes": {
1026-
"db.system": "clickhouse",
1026+
"db.system.name": "clickhouse",
10271027
"db.driver.name": "clickhouse-driver",
1028-
"db.name": "",
1028+
"db.namespace": "",
10291029
"db.user": "default",
10301030
"sentry.op": "db",
10311031
"sentry.origin": "auto.db.clickhouse_driver",
@@ -1038,9 +1038,9 @@ def test_clickhouse_dbapi_spans(
10381038
{
10391039
"name": "INSERT INTO test (x) VALUES",
10401040
"attributes": {
1041-
"db.system": "clickhouse",
1041+
"db.system.name": "clickhouse",
10421042
"db.driver.name": "clickhouse-driver",
1043-
"db.name": "",
1043+
"db.namespace": "",
10441044
"db.user": "default",
10451045
"sentry.op": "db",
10461046
"sentry.origin": "auto.db.clickhouse_driver",
@@ -1053,9 +1053,9 @@ def test_clickhouse_dbapi_spans(
10531053
{
10541054
"name": "INSERT INTO test (x) VALUES",
10551055
"attributes": {
1056-
"db.system": "clickhouse",
1056+
"db.system.name": "clickhouse",
10571057
"db.driver.name": "clickhouse-driver",
1058-
"db.name": "",
1058+
"db.namespace": "",
10591059
"db.user": "default",
10601060
"sentry.op": "db",
10611061
"sentry.origin": "auto.db.clickhouse_driver",
@@ -1068,9 +1068,9 @@ def test_clickhouse_dbapi_spans(
10681068
{
10691069
"name": "SELECT sum(x) FROM test WHERE x > 150",
10701070
"attributes": {
1071-
"db.system": "clickhouse",
1071+
"db.system.name": "clickhouse",
10721072
"db.driver.name": "clickhouse-driver",
1073-
"db.name": "",
1073+
"db.namespace": "",
10741074
"db.user": "default",
10751075
"sentry.op": "db",
10761076
"sentry.origin": "auto.db.clickhouse_driver",
@@ -1263,8 +1263,8 @@ def test_clickhouse_dbapi_spans_with_pii(
12631263
{
12641264
"name": "DROP TABLE IF EXISTS test",
12651265
"attributes": {
1266-
"db.system": "clickhouse",
1267-
"db.name": "",
1266+
"db.system.name": "clickhouse",
1267+
"db.namespace": "",
12681268
"db.user": "default",
12691269
"sentry.op": "db",
12701270
"sentry.origin": "auto.db.clickhouse_driver",
@@ -1277,8 +1277,8 @@ def test_clickhouse_dbapi_spans_with_pii(
12771277
{
12781278
"name": "CREATE TABLE test (x Int32) ENGINE = Memory",
12791279
"attributes": {
1280-
"db.system": "clickhouse",
1281-
"db.name": "",
1280+
"db.system.name": "clickhouse",
1281+
"db.namespace": "",
12821282
"db.user": "default",
12831283
"sentry.op": "db",
12841284
"sentry.origin": "auto.db.clickhouse_driver",
@@ -1291,8 +1291,8 @@ def test_clickhouse_dbapi_spans_with_pii(
12911291
{
12921292
"name": "INSERT INTO test (x) VALUES",
12931293
"attributes": {
1294-
"db.system": "clickhouse",
1295-
"db.name": "",
1294+
"db.system.name": "clickhouse",
1295+
"db.namespace": "",
12961296
"db.user": "default",
12971297
"sentry.op": "db",
12981298
"sentry.origin": "auto.db.clickhouse_driver",
@@ -1305,8 +1305,8 @@ def test_clickhouse_dbapi_spans_with_pii(
13051305
{
13061306
"name": "INSERT INTO test (x) VALUES",
13071307
"attributes": {
1308-
"db.system": "clickhouse",
1309-
"db.name": "",
1308+
"db.system.name": "clickhouse",
1309+
"db.namespace": "",
13101310
"db.user": "default",
13111311
"sentry.op": "db",
13121312
"sentry.origin": "auto.db.clickhouse_driver",
@@ -1319,8 +1319,8 @@ def test_clickhouse_dbapi_spans_with_pii(
13191319
{
13201320
"name": "SELECT sum(x) FROM test WHERE x > 150",
13211321
"attributes": {
1322-
"db.system": "clickhouse",
1323-
"db.name": "",
1322+
"db.system.name": "clickhouse",
1323+
"db.namespace": "",
13241324
"db.user": "default",
13251325
"sentry.op": "db",
13261326
"sentry.origin": "auto.db.clickhouse_driver",

0 commit comments

Comments
 (0)