Skip to content
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.

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

Add mysqlclient instrumentor support for sqlcommenting #2941

Merged
merged 37 commits into from
Nov 21, 2024
Merged
Show file tree
Hide file tree
Changes from 35 commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
224a771
WIP
tammy-baylis-swi Oct 9, 2024
3c43604
Add _DB_DRIVER_ALIASES
tammy-baylis-swi Oct 9, 2024
cec3a86
Add mysql_client_version to sqlcomment
tammy-baylis-swi Oct 9, 2024
47cdaa9
lint
tammy-baylis-swi Oct 9, 2024
b9335f0
Fix existing tests
tammy-baylis-swi Oct 9, 2024
881f4af
lint test
tammy-baylis-swi Oct 9, 2024
b0a9efd
Add PyMySQL dbapi commenter case
tammy-baylis-swi Oct 9, 2024
4dd9f73
Add test
tammy-baylis-swi Oct 10, 2024
d56eb21
Add test
tammy-baylis-swi Oct 10, 2024
385ea6c
Add test
tammy-baylis-swi Oct 10, 2024
52430b5
Add tests
tammy-baylis-swi Oct 10, 2024
98ee019
Changelog
tammy-baylis-swi Oct 11, 2024
b9fbc50
Merge branch 'main' into sqlcommenting-mysql-driver
tammy-baylis-swi Oct 11, 2024
8e4cb08
calculate_commenter_data at init of DatabaseApiIntegration
tammy-baylis-swi Oct 11, 2024
8755339
Merge branch 'main' into sqlcommenting-mysql-driver
tammy-baylis-swi Oct 15, 2024
66afad7
Add mysqlclient sqlcomment support
tammy-baylis-swi Oct 16, 2024
c9c0dc5
Fix typo
tammy-baylis-swi Oct 16, 2024
4e6ab3f
try-except if NoneType module
tammy-baylis-swi Oct 16, 2024
637b95b
Merge branch 'sqlcommenting-mysql-driver' into mysqlclient-sqlcomment
tammy-baylis-swi Oct 16, 2024
81a2a4f
Add unit test
tammy-baylis-swi Oct 16, 2024
2e6357f
Merge branch 'main' into mysqlclient-sqlcomment
tammy-baylis-swi Oct 30, 2024
82804b0
Merge branch 'main' into mysqlclient-sqlcomment
tammy-baylis-swi Oct 30, 2024
ebb9485
CHangelog
tammy-baylis-swi Oct 30, 2024
8d8187e
Merge branch 'main' into mysqlclient-sqlcomment
tammy-baylis-swi Oct 31, 2024
3131641
Merge branch 'main' into mysqlclient-sqlcomment
tammy-baylis-swi Nov 6, 2024
44365de
Merge branch 'main' into mysqlclient-sqlcomment
tammy-baylis-swi Nov 19, 2024
1739d8e
Merge branch 'main' into mysqlclient-sqlcomment
tammy-baylis-swi Nov 19, 2024
b4171de
Merge branch 'main' into mysqlclient-sqlcomment
tammy-baylis-swi Nov 19, 2024
dfd53b1
mysqlclient instrument_connection with connect_module
tammy-baylis-swi Nov 20, 2024
d72d880
add tests
tammy-baylis-swi Nov 20, 2024
f33e219
more tests
tammy-baylis-swi Nov 20, 2024
7c9d299
more tests 2
tammy-baylis-swi Nov 20, 2024
44fdfdb
Merge branch 'main' into mysqlclient-sqlcomment
tammy-baylis-swi Nov 20, 2024
35218f4
lint
tammy-baylis-swi Nov 20, 2024
e0ecef0
Redesign tests
tammy-baylis-swi Nov 20, 2024
606ba07
Merge branch 'main' into mysqlclient-sqlcomment
tammy-baylis-swi Nov 20, 2024
740df4b
Rm unnecessary mocks
tammy-baylis-swi Nov 20, 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
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
([#2937](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2937))
- `opentelemetry-instrumentation-dbapi` Add sqlcomment to `db.statement` attribute
([#2935](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2935))
- `opentelemetry-instrumentation-mysqlclient` Add sqlcommenter support
([#2941](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2941))

### Fixed

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,72 @@
cursor.close()
cnx.close()

SQLCOMMENTER
*****************************************
You can optionally configure MySQLClient instrumentation to enable sqlcommenter which enriches
the query with contextual information.

.. code:: python

import MySQLdb
from opentelemetry.instrumentation.mysqlclient import MySQLClientInstrumentor


MySQLClientInstrumentor().instrument(enable_commenter=True, commenter_options={})

cnx = MySQLdb.connect(database="MySQL_Database")
cursor = cnx.cursor()
cursor.execute("INSERT INTO test (testField) VALUES (123)"
cnx.commit()
cursor.close()
cnx.close()

For example,
::

Invoking cursor.execute("INSERT INTO test (testField) VALUES (123)") will lead to sql query "INSERT INTO test (testField) VALUES (123)" but when SQLCommenter is enabled
the query will get appended with some configurable tags like "INSERT INTO test (testField) VALUES (123) /*tag=value*/;"

SQLCommenter Configurations
***************************
We can configure the tags to be appended to the sqlquery log by adding configuration inside commenter_options(default:{}) keyword

db_driver = True(Default) or False

For example,
::
Enabling this flag will add MySQLdb and its version, e.g. /*MySQLdb%%3A1.2.3*/

dbapi_threadsafety = True(Default) or False

For example,
::
Enabling this flag will add threadsafety /*dbapi_threadsafety=2*/

dbapi_level = True(Default) or False

For example,
::
Enabling this flag will add dbapi_level /*dbapi_level='2.0'*/

mysql_client_version = True(Default) or False

For example,
::
Enabling this flag will add mysql_client_version /*mysql_client_version='123'*/

driver_paramstyle = True(Default) or False

For example,
::
Enabling this flag will add driver_paramstyle /*driver_paramstyle='pyformat'*/

opentelemetry_values = True(Default) or False

For example,
::
Enabling this flag will add traceparent values /*traceparent='00-03afa25236b8cd948fa853d67038ac79-405ff022e8247c46-01'*/

API
---
"""
Expand All @@ -59,14 +125,16 @@


class MySQLClientInstrumentor(BaseInstrumentor):
def instrumentation_dependencies(self) -> Collection[str]:
def instrumentation_dependencies(self) -> Collection[str]: # pylint: disable=no-self-use
aabmass marked this conversation as resolved.
Show resolved Hide resolved
return _instruments

def _instrument(self, **kwargs):
def _instrument(self, **kwargs): # pylint: disable=no-self-use
"""Integrate with the mysqlclient library.
https://github.com/PyMySQL/mysqlclient/
"""
tracer_provider = kwargs.get("tracer_provider")
enable_sqlcommenter = kwargs.get("enable_commenter", False)
commenter_options = kwargs.get("commenter_options", {})

dbapi.wrap_connect(
__name__,
Expand All @@ -76,14 +144,21 @@ def _instrument(self, **kwargs):
_CONNECTION_ATTRIBUTES,
version=__version__,
tracer_provider=tracer_provider,
enable_commenter=enable_sqlcommenter,
commenter_options=commenter_options,
)

def _uninstrument(self, **kwargs):
def _uninstrument(self, **kwargs): # pylint: disable=no-self-use
""" "Disable mysqlclient instrumentation"""
dbapi.unwrap_connect(MySQLdb, "connect")

@staticmethod
def instrument_connection(connection, tracer_provider=None):
def instrument_connection(
connection,
tracer_provider=None,
enable_commenter=None,
commenter_options=None,
):
"""Enable instrumentation in a mysqlclient connection.

Args:
Expand All @@ -102,6 +177,9 @@ def instrument_connection(connection, tracer_provider=None):
_CONNECTION_ATTRIBUTES,
version=__version__,
tracer_provider=tracer_provider,
enable_commenter=enable_commenter,
commenter_options=commenter_options,
connect_module=MySQLdb,
)

@staticmethod
Expand Down
Loading
Loading