.

Author: alexander-alderman-webb

sentry_sdk/integrations/clickhouse_driver.py

@@ -84,7 +84,7 @@ def _inner(*args: "P.args", **kwargs: "P.kwargs") -> "T":
 
         if has_span_streaming_enabled(client.options):
             span = sentry_sdk.traces.start_span(
-                name=query,
+                name=query,  # type: ignore
                 attributes={
                     "sentry.op": OP.DB,
                     "sentry.origin": ClickhouseDriverIntegration.origin,
@@ -192,11 +192,11 @@ def wrapped_generator() -> "Iterator[Any]":
 
 def _set_db_data(span: "Union[Span, StreamedSpan]", connection: "Connection") -> None:
     if isinstance(span, StreamedSpan):
-        span.set_attribute(SPANDATA.DB_SYSTEM, "clickhouse")
+        span.set_attribute(SPANDATA.DB_SYSTEM_NAME, "clickhouse")
         span.set_attribute(SPANDATA.DB_DRIVER_NAME, "clickhouse-driver")
         span.set_attribute(SPANDATA.SERVER_ADDRESS, connection.host)
         span.set_attribute(SPANDATA.SERVER_PORT, connection.port)
-        span.set_attribute(SPANDATA.DB_NAME, connection.database)
+        span.set_attribute(SPANDATA.DB_NAMESPACE, connection.database)
         span.set_attribute(SPANDATA.DB_USER, connection.user)
     else:
         span.set_data(SPANDATA.DB_SYSTEM, "clickhouse")

tests/integrations/clickhouse_driver/test_clickhouse_driver.py

@@ -267,7 +267,7 @@ def test_clickhouse_client_spans(
             assert res[0][0] == 370
 
         sentry_sdk.flush()
-        spans = [item.payload for item in items if item.type == "span"]
+        spans = [item.payload for item in items]
 
         expected_spans = [
             {
@@ -554,7 +554,7 @@ def test_clickhouse_client_spans_with_pii(
             assert res[0][0] == 370
 
         sentry_sdk.flush()
-        spans = [item.payload for item in items if item.type == "span"]
+        spans = [item.payload for item in items]
 
         expected_spans = [
             {
@@ -1002,7 +1002,7 @@ def test_clickhouse_dbapi_spans(
             res = cursor.fetchall()
 
         sentry_sdk.flush()
-        spans = [item.payload for item in items if item.type == "span"]
+        spans = [item.payload for item in items]
 
         expected_spans = [
             {
@@ -1257,7 +1257,7 @@ def test_clickhouse_dbapi_spans_with_pii(
         assert res[0][0] == 370
 
         sentry_sdk.flush()
-        spans = [item.payload for item in items if item.type == "span"]
+        spans = [item.payload for item in items]
 
         expected_spans = [
             {
@@ -1491,7 +1491,7 @@ def test_span_origin(
             cursor.execute("SELECT 1")
 
         sentry_sdk.flush()
-        spans = [item.payload for item in items if item.type == "span"]
+        spans = [item.payload for item in items]
 
         assert spans[1]["attributes"]["sentry.origin"] == "manual"
         assert spans[0]["attributes"]["sentry.origin"] == "auto.db.clickhouse_driver"