Skip to content

Fix clickhouse-driver integration spans #3638

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

Merged
merged 10 commits into from
Oct 10, 2024
Merged

Fix clickhouse-driver integration spans #3638

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
fe3cdda
Fix data in clickhouse-driver integration
sentrivana Oct 9, 2024
35b7015
add more attrs
sentrivana Oct 9, 2024
66cb16a
expose get_attribute
sentrivana Oct 9, 2024
cd22cbd
more fixes
sentrivana Oct 9, 2024
b9b02e6
fixes
sentrivana Oct 9, 2024
d96ec3c
.
sentrivana Oct 9, 2024
0d31853
save stuff on conn
sentrivana Oct 10, 2024
64f77b2
clean up after ourselves
sentrivana Oct 10, 2024
1aab2f3
no query id
sentrivana Oct 10, 2024
5f440df
use spandata
sentrivana Oct 10, 2024
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
17 changes: 12 additions & 5 deletions sentry_sdk/integrations/clickhouse_driver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ def _inner(*args: P.args, **kwargs: P.kwargs) -> T:

_set_db_data(span, connection)

span.set_data("query", query)
span.set_data("db.query.text", query)
Copy link
Contributor Author

@sentrivana sentrivana Oct 9, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://opentelemetry.io/docs/specs/semconv/database/database-spans/#common-attributes


if query_id:
span.set_data("db.query_id", query_id)
Expand All @@ -118,9 +118,16 @@ def _inner_end(*args: P.args, **kwargs: P.kwargs) -> T:
span.set_data("db.result", res)

with capture_internal_exceptions():
span.scope.add_breadcrumb(
message=span._data.pop("query"), category="query", data=span._data
)
query = span._get_attribute("db.query.text")
Copy link
Member

@sl0thentr0py sl0thentr0py Oct 9, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we need to access attributes outside, let's officially expose get_attributes or a @property called attributes. Accessing underscore methods outside the implementation is an anti-pattern and we should stop doing that.

data = {}
for attr in ("db.query_id", "db.params", "db.result"):
if span._get_attribute(attr):
data[attr] = span._get_attribute(attr)

if query:
sentry_sdk.add_breadcrumb(
message=query, category="query", data=data
)

span.finish()

Expand All @@ -139,7 +146,7 @@ def _inner_send_data(*args: P.args, **kwargs: P.kwargs) -> T:
_set_db_data(span, instance.connection)

if should_send_default_pii():
db_params = span._data.get("db.params", [])
db_params = span._get_attribute("db.params") or []
db_params.extend(data)
span.set_data("db.params", db_params)

Expand Down
Loading