Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
45 changes: 12 additions & 33 deletions sentry_sdk/integrations/aiomysql.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
from sentry_sdk.traces import StreamedSpan
from sentry_sdk.tracing_utils import (
add_query_source,
has_span_streaming_enabled,
record_sql_queries,
)
from sentry_sdk.utils import (
Expand Down Expand Up @@ -187,42 +186,22 @@ async def _inner(self: "Connection") -> T:
if client.get_integration(AioMySQLIntegration) is None:
return await f(self)

if has_span_streaming_enabled(client.options):
breadcrumb_data = _get_connect_data(self, use_streaming_keys=True)
breadcrumb_data = _get_connect_data(self, use_streaming_keys=True)

with capture_internal_exceptions():
sentry_sdk.add_breadcrumb(
message="connect", category="query", data=breadcrumb_data
)

if sentry_sdk.traces.get_current_span() is None:
return await f(self)

span_attributes: dict[str, Any] = {
"sentry.op": OP.DB,
"sentry.origin": AioMySQLIntegration.origin,
} | breadcrumb_data

Comment thread
sentrivana marked this conversation as resolved.
with sentry_sdk.traces.start_span(
name="connect", attributes=span_attributes
):
return await f(self)
with capture_internal_exceptions():
sentry_sdk.add_breadcrumb(
message="connect", category="query", data=breadcrumb_data
)

connect_data = _get_connect_data(self)
if sentry_sdk.traces.get_current_span() is None:
return await f(self)

with sentry_sdk.start_span(
op=OP.DB,
name="connect",
origin=AioMySQLIntegration.origin,
) as span:
_set_db_data(span, self)
span_attributes: dict[str, Any] = {
"sentry.op": OP.DB,
"sentry.origin": AioMySQLIntegration.origin,
} | breadcrumb_data

with capture_internal_exceptions():
sentry_sdk.add_breadcrumb(
message="connect",
category="query",
data=connect_data,
)
with sentry_sdk.traces.start_span(name="connect", attributes=span_attributes):
return await f(self)

return _inner
Expand Down
Loading
Loading