Skip to content

chore(clickhouse_driver): Remove transaction-based tracing #7233

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
alexander-alderman-webb wants to merge 2 commits into
base: major/3.0
Choose a base branch
from
Draft

chore(clickhouse_driver): Remove transaction-based tracing #7233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
48c48a5
chore(clickhouse_driver): Remove transaction-based tracing
alexander-alderman-webb Aug 24, 2026
d88ce9f
remove test_clickhouse_spans_with_generator
alexander-alderman-webb Aug 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 12 additions & 49 deletions sentry_sdk/integrations/clickhouse_driver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
from sentry_sdk.scope import should_send_default_pii
from sentry_sdk.traces import StreamedSpan
from sentry_sdk.tracing import Span
from sentry_sdk.tracing_utils import has_span_streaming_enabled
from sentry_sdk.utils import capture_internal_exceptions, has_data_collection_enabled
from sentry_sdk.utils import has_data_collection_enabled

# Hack to get new Python features working in older versions
# without introducing a hard dependency on `typing_extensions`
Expand Down Expand Up @@ -81,38 +80,18 @@ def _inner(*args: "P.args", **kwargs: "P.kwargs") -> "T":

connection = args[0]
query = args[1]
query_id = args[2] if len(args) > 2 else kwargs.get("query_id")
params = args[3] if len(args) > 3 else kwargs.get("params")

if has_span_streaming_enabled(client.options):
span = None
if sentry_sdk.traces.get_current_span() is not None:
span = sentry_sdk.traces.start_span(
name=query, # type: ignore
attributes={
"sentry.op": OP.DB,
"sentry.origin": ClickhouseDriverIntegration.origin,
SPANDATA.DB_QUERY_TEXT: str(query),
},
)
else:
span = sentry_sdk.start_span(
op=OP.DB,
name=query,
origin=ClickhouseDriverIntegration.origin,
)

span.set_data("query", query)

if query_id:
span.set_data("db.query_id", query_id)
if sentry_sdk.traces.get_current_span() is None:
return f(*args, **kwargs)

if params:
if has_data_collection_enabled(client.options):
if client.options["data_collection"]["database_query_data"]:
span.set_data("db.params", params)
elif should_send_default_pii():
span.set_data("db.params", params)
span = sentry_sdk.traces.start_span(
name=query, # type: ignore
attributes={
"sentry.op": OP.DB,
"sentry.origin": ClickhouseDriverIntegration.origin,
SPANDATA.DB_QUERY_TEXT: str(query),
},
)

connection._sentry_span = span # type: ignore[attr-defined]

Expand All @@ -136,23 +115,7 @@ def _inner_end(*args: "P.args", **kwargs: "P.kwargs") -> "T":
if span is None:
return res

if isinstance(span, StreamedSpan):
span.end()
else:
if res is not None:
client_options = sentry_sdk.get_client().options
if has_data_collection_enabled(client_options):
if client_options["data_collection"]["database_query_data"]:
span.set_data("db.result", res)
elif should_send_default_pii():
span.set_data("db.result", res)

with capture_internal_exceptions():
span.scope.add_breadcrumb(
message=span._data.pop("query"), category="query", data=span._data
)

span.finish()
span.end()

return res

Expand Down
Loading
Loading