Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
878dc5b
integration for aiomysql
tonal Aug 14, 2025
29b4e85
Drop _wrap_cursor_creation in integration aiomysql.py
tonal Aug 20, 2025
28e79b6
Potential KeyError in _wrap_connect
tonal Aug 20, 2025
950032f
Merge branch 'getsentry:master' into patch-2
tonal Aug 20, 2025
421abfa
Merge branch 'master' into patch-2
tonal Sep 10, 2025
ab35ef8
Merge branch 'master' into patch-2
antonpirker Sep 11, 2025
c09eb44
Merge branch 'master' into patch-2
tonal Sep 16, 2025
b3b04a1
Merge branch 'master' into patch-2
tonal Oct 10, 2025
d9d7282
Merge branch 'master' into patch-2
tonal Oct 31, 2025
faf1a87
Merge branch 'getsentry:master' into patch-2
tonal Apr 12, 2026
89b8669
feat(aiomysql): Add aiomysql integration
tonal Apr 12, 2026
ad11c32
fix(aiomysql): Address PR review comments
tonal Apr 13, 2026
e25d3ad
Merge remote-tracking branch 'origin/patch-2' into patch-2
tonal Apr 13, 2026
5f26753
fix(aiomysql): Remove duplicate MySQL service block from Jinja template
tonal Apr 13, 2026
a7319c9
fix(aiomysql): Use public cursor.connection instead of private _conne…
tonal Apr 13, 2026
5d39b16
fix(aiomysql): Use explicit signature in _wrap_connect to handle posi…
tonal Apr 13, 2026
facbe7b
Merge branch 'master' into patch-2
tonal Apr 13, 2026
3d85885
fix(aiomysql): Format code and add cryptography dep for MySQL 8.0 auth
tonal Apr 14, 2026
6e05b78
fix(aiomysql): Instrument Connection._connect to cover create_pool an…
tonal Apr 14, 2026
308571f
fix(aiomysql): Reuse _set_db_data in connect span for consistent null…
tonal Apr 14, 2026
a8e79d5
Merge upstream/master into patch-2
tonal May 12, 2026
93a0de6
Merge upstream/master into patch-2
tonal May 12, 2026
81825b6
fix(aiomysql): Use record_sql_queries_supporting_streaming
tonal May 12, 2026
a0143fd
fix(aiomysql): Support span streaming in _set_db_data and _wrap_connect
tonal May 12, 2026
53a276c
fix(aiomysql): Handle add_query_source for StreamedSpan and fix test …
tonal May 12, 2026
1a47a2e
fix(aiomysql): Add cryptography dep for MySQL 8.0 auth
tonal May 21, 2026
020d582
fix(aiomysql): Remove from auto-enabling list per review
tonal May 21, 2026
c09a123
Merge upstream/master into patch-2
tonal May 21, 2026
d15d55a
fix(aiomysql): Use record_sql_queries (renamed back in upstream)
tonal May 21, 2026
36ed7d6
fix(aiomysql): Fix mypy errors and remove unrelated files
tonal May 21, 2026
7a646df
fix(aiomysql): Use import-not-found only in type: ignore
tonal May 21, 2026
fe98f95
fix(aiomysql): Fix mypy import-not-found on single line
tonal May 21, 2026
61ce6aa
Merge remote-tracking branch 'upstream/master' into patch-2
tonal May 22, 2026
db77a50
Merge branch 'master' into patch-2
tonal May 22, 2026
ddd200d
fix(aiomysql): Move config entry to alphabetical order
tonal May 22, 2026
43ca59d
fix(aiomysql): Populate breadcrumb data independently of span
tonal May 22, 2026
a1b709b
Merge upstream/master into patch-2
tonal Jun 1, 2026
7c952eb
fix(ci): Add MySQL service container support to CI workflows
tonal Jun 1, 2026
da6db01
fix(aiomysql): Use correct span attributes for StreamedSpan
tonal Jun 1, 2026
f59e01c
fix(aiomysql): Separate breadcrumb data from span attributes
tonal Jun 1, 2026
e14f988
Merge upstream/master into patch-2
tonal Jun 2, 2026
dad32a4
Merge upstream/master into patch-2
tonal Jun 3, 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
174 changes: 174 additions & 0 deletions sentry_sdk/integrations/aiomysql.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,174 @@
# -*- coding: utf-8 -*-
"""
Adapted from module sentry_sdk.integrations.asyncpg
"""

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Hi @tonal ,

Thanks for the contribution, much appreciated!

Can you add unit tests for the integration as well? You can probably adapt them from the asyncpg tests.

from __future__ import annotations
import contextlib
from typing import Any, TypeVar, Callable, Awaitable, Iterator

import sentry_sdk
from sentry_sdk.consts import OP, SPANDATA
from sentry_sdk.integrations import _check_minimum_version, Integration, DidNotEnable
from sentry_sdk.tracing import Span
from sentry_sdk.tracing_utils import add_query_source, record_sql_queries
from sentry_sdk.utils import (
ensure_integration_enabled,
parse_version,
capture_internal_exceptions,
)

try:
import aiomysql # type: ignore[import-not-found]
from aiomysql.connection import Connection, Cursor # type: ignore
except ImportError:
raise DidNotEnable("aiomysql not installed.")


class AioMySQLIntegration(Integration):
identifier = "aiomysql"
origin = f"auto.db.{identifier}"
_record_params = False

def __init__(self, *, record_params: bool = False):
AioMySQLIntegration._record_params = record_params

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Bug: Shared Class Variable Causes Instance Conflicts

The _record_params attribute is set as a class variable in __init__. This causes all AioMySQLIntegration instances to share the same record_params value, leading to unexpected behavior if different instances are configured.

Fix in Cursor Fix in Web


@staticmethod
def setup_once() -> None:
aiomysql_version = parse_version(aiomysql.__version__)
_check_minimum_version(AioMySQLIntegration, aiomysql_version)
Comment thread
tonal marked this conversation as resolved.
Outdated

aiomysql.Connection.query = _wrap_execute(
aiomysql.Connection.query,
)

aiomysql.Connection.cursor = _wrap_cursor_creation(
aiomysql.Connection.cursor
)

aiomysql.connect = _wrap_connect(aiomysql.connect)


T = TypeVar("T")


def _wrap_execute(f: Callable[..., Awaitable[T]]) -> Callable[..., Awaitable[T]]:
async def _inner(*args: Any, **kwargs: Any) -> T:
if sentry_sdk.get_client().get_integration(AioMySQLIntegration) is None:
return await f(*args, **kwargs)

conn = args[0]
query = args[1] # В aiomysql запрос передается первым аргументом
with record_sql_queries(
cursor=None,
query=query,
params_list=None,
paramstyle=None,
executemany=False,
span_origin=AioMySQLIntegration.origin,
) as span:
res = await f(*args, **kwargs)
span.set_data("db.affected_rows", res)
Comment thread
cursor[bot] marked this conversation as resolved.
Outdated

with capture_internal_exceptions():
add_query_source(span)
Comment thread
tonal marked this conversation as resolved.
Outdated

return res

return _inner


SubCursor = TypeVar("SubCursor", bound=Cursor)


@contextlib.contextmanager
def _record(
cursor: SubCursor | None,
query: str,
params_list: tuple[Any, ...] | None,
*,
executemany: bool = False,
) -> Iterator[Span]:
integration = sentry_sdk.get_client().get_integration(AioMySQLIntegration)
if integration is not None and not integration._record_params:
params_list = None

param_style = "pyformat" if params_list else None

with record_sql_queries(
cursor=cursor,
query=query,
params_list=params_list,
paramstyle=param_style,
executemany=executemany,
record_cursor_repr=cursor is not None,
span_origin=AioMySQLIntegration.origin,
) as span:
yield span
Comment thread
sentry[bot] marked this conversation as resolved.
Outdated
Comment thread
cursor[bot] marked this conversation as resolved.
Outdated

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Bug: Unused Functions Cause Missing Metadata

The _record function is unused. Additionally, _set_db_data is never called, which means spans created by _wrap_execute for database queries are missing important connection metadata like host, port, database name, and user.

Fix in Cursor Fix in Web


def _wrap_cursor_creation(f: Callable[..., T]) -> Callable[..., T]:
@ensure_integration_enabled(AioMySQLIntegration, f)
def _inner(*args: Any, **kwargs: Any) -> T:
query = args[0]
params_list = args[1] if len(args) > 1 else None

with _record(None, query, params_list, executemany=False) as span:
_set_db_data(span, args[0])
res = f(*args, **kwargs)
span.set_data("db.cursor", res._coro.result())

return res

return _inner
Comment thread
tonal marked this conversation as resolved.
Outdated

Comment thread
cursor[bot] marked this conversation as resolved.
Outdated

def _wrap_connect(f: Callable[..., T]) -> Callable[..., T]:
def _inner(*args: Any, **kwargs: Any) -> T:
if sentry_sdk.get_client().get_integration(AioMySQLIntegration) is None:
return f(*args, **kwargs)

host = kwargs["host"]
port = kwargs.get("port") or 3306
user = kwargs["user"]
db = kwargs["db"]
Comment thread
tonal marked this conversation as resolved.
Outdated
Comment thread
cursor[bot] marked this conversation as resolved.
Outdated

with sentry_sdk.start_span(
op=OP.DB,
name="connect",
origin=AioMySQLIntegration.origin,
) as span:
span.set_data(SPANDATA.DB_SYSTEM, "mysql")
span.set_data(SPANDATA.SERVER_ADDRESS, host)
span.set_data(SPANDATA.SERVER_PORT, port)
span.set_data(SPANDATA.DB_NAME, db)
span.set_data(SPANDATA.DB_USER, user)

with capture_internal_exceptions():
sentry_sdk.add_breadcrumb(
message="connect", category="query", data=span._data
)
res = f(*args, **kwargs)

return res

return _inner
Comment thread
cursor[bot] marked this conversation as resolved.
Outdated


def _set_db_data(span: Span, conn: Any) -> None:
span.set_data(SPANDATA.DB_SYSTEM, "mysql")

host = conn.host
if host:
span.set_data(SPANDATA.SERVER_ADDRESS, host)

port = conn.port
if port:
span.set_data(SPANDATA.SERVER_PORT, port)

database = conn.db
if database:
span.set_data(SPANDATA.DB_NAME, database)

user = conn.user
if user:
span.set_data(SPANDATA.DB_USER, user)
Comment thread
tonal marked this conversation as resolved.
Outdated