Skip to content

instrumentation/mysql_connector: fix connection retrieval #2344

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 1 commit into from
Jul 10, 2025
Merged

instrumentation/mysql_connector: fix connection retrieval #2344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions elasticapm/instrumentation/packages/mysql_connector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,8 @@ def extract_signature(self, sql):

@property
def _self_database(self) -> str:
# for unknown reasons, the connection is available as the `_connection` attribute on Python 3.6,
# and as `_cnx` on later Python versions
connection = getattr(self, "_cnx") or getattr(self, "_connection")
# it looks like the connection is available as the `_connection` or as `_cnx` depending on Python versions
connection = getattr(self, "_connection", None) or getattr(self, "_cnx", None)
return connection.database if connection else ""


Expand Down
3 changes: 0 additions & 3 deletions tests/instrumentation/mysql_connector_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,6 @@ def mysql_connector_connection(request):
cursor.execute("DROP TABLE `test`")


@pytest.mark.skipif(
sys.version_info >= (3, 12), reason="Perhaps related to changes in weakref in py3.12?"
) # TODO py3.12
@pytest.mark.integrationtest
def test_mysql_connector_select(instrument, mysql_connector_connection, elasticapm_client):
cursor = mysql_connector_connection.cursor()
Expand Down
Loading