Revert "Add mysql-connector instrumentor support for sqlcommenting (#3163)"

This reverts commit d83a5c4.

Author: aryabharat

CHANGELOG.md

@@ -51,8 +51,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#3206](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3206))
 - `opentelemetry-instrumentation-pymssql` Add pymssql instrumentation
   ([#394](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/394))
-- `opentelemetry-instrumentation-mysql` Add sqlcommenter support
-  ([#3163](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3163))
 
 ### Fixed
 

instrumentation/opentelemetry-instrumentation-dbapi/src/opentelemetry/instrumentation/dbapi/__init__.py

@@ -498,11 +498,6 @@ def _update_args_with_added_sql_comment(self, args, cursor) -> tuple:
             args_list = list(args)
             self._capture_mysql_version(cursor)
             commenter_data = self._get_commenter_data()
-            # Convert sql statement to string, handling  psycopg2.sql.Composable object
-            if hasattr(args_list[0], "as_string"):
-                args_list[0] = args_list[0].as_string(cursor.connection)
-
-            args_list[0] = str(args_list[0])
             statement = _add_sql_comment(args_list[0], **commenter_data)
             args_list[0] = statement
             args = tuple(args_list)

instrumentation/opentelemetry-instrumentation-django/src/opentelemetry/instrumentation/django/middleware/sqlcommenter_middleware.py

@@ -80,12 +80,6 @@ def __call__(self, execute: Type[T], sql, params, many, context) -> T:
         db_driver = context["connection"].settings_dict.get("ENGINE", "")
         resolver_match = self.request.resolver_match
 
-        # Convert sql statement to string, handling psycopg2.sql.Composable object
-        if hasattr(sql, "as_string"):
-            sql = sql.as_string(context["connection"])
-
-        sql = str(sql)
-
         sql = _add_sql_comment(
             sql,
             # Information about the controller.

instrumentation/opentelemetry-instrumentation-mysql/src/opentelemetry/instrumentation/mysql/__init__.py

@@ -50,95 +50,6 @@
     cursor.close()
     instrumented_cnx.close()
 
-SQLCOMMENTER
-*****************************************
-You can optionally configure mysql-connector instrumentation to enable sqlcommenter which enriches the query with contextual information.
-
-Usage
------
-
-.. code:: python
-
-    import mysql.connector
-    from opentelemetry.instrumentation.mysql import MySQLInstrumentor
-
-    MySQLInstrumentor().instrument(enable_commenter=True, commenter_options={})
-
-    cnx = mysql.connector.connect(database="MySQL_Database")
-    cursor = cnx.cursor()
-    cursor.execute("INSERT INTO test (testField) VALUES (123)")
-    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*/;"
-
-**WARNING:** sqlcommenter for mysql-connector instrumentation should NOT be used if your application initializes cursors with ``prepared=True``, which will natively prepare and execute MySQL statements. Adding sqlcommenting will introduce a severe performance penalty by repeating ``Prepare`` of statements by mysql-connector that are made unique by traceparent in sqlcomment. The penalty does not happen if cursor ``prepared=False`` (default) and instrumentor ``enable_commenter=True``.
-
-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 mysql.connector and its version, e.g. /*mysql.connector%%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'*/
-
-SQLComment in span attribute
-****************************
-If sqlcommenter is enabled, you can optionally configure mysql-connector instrumentation to append sqlcomment to query span attribute for convenience of your platform.
-
-.. code:: python
-
-    from opentelemetry.instrumentation.mysql import MySQLInstrumentor
-
-    MySQLInstrumentor().instrument(
-        enable_commenter=True,
-        enable_attribute_commenter=True,
-    )
-
-
-For example,
-::
-
-    Invoking cursor.execute("select * from auth_users") will lead to sql query "select * from auth_users" but when SQLCommenter and attribute_commenter are enabled
-    the query will get appended with some configurable tags like "select * from auth_users /*tag=value*/;" for both server query and `db.statement` span attribute.
-
 API
 ---
 """
@@ -171,11 +82,6 @@ def _instrument(self, **kwargs):
         https://dev.mysql.com/doc/connector-python/en/
         """
         tracer_provider = kwargs.get("tracer_provider")
-        enable_sqlcommenter = kwargs.get("enable_commenter", False)
-        commenter_options = kwargs.get("commenter_options", {})
-        enable_attribute_commenter = kwargs.get(
-            "enable_attribute_commenter", False
-        )
 
         dbapi.wrap_connect(
             __name__,
@@ -185,24 +91,14 @@ def _instrument(self, **kwargs):
             self._CONNECTION_ATTRIBUTES,
             version=__version__,
             tracer_provider=tracer_provider,
-            enable_commenter=enable_sqlcommenter,
-            commenter_options=commenter_options,
-            enable_attribute_commenter=enable_attribute_commenter,
         )
 
     def _uninstrument(self, **kwargs):
         """ "Disable MySQL instrumentation"""
         dbapi.unwrap_connect(mysql.connector, "connect")
 
     # pylint:disable=no-self-use
-    def instrument_connection(
-        self,
-        connection,
-        tracer_provider=None,
-        enable_commenter=None,
-        commenter_options=None,
-        enable_attribute_commenter=None,
-    ):
+    def instrument_connection(self, connection, tracer_provider=None):
         """Enable instrumentation in a MySQL connection.
 
         Args:
@@ -213,12 +109,6 @@ def instrument_connection(
             tracer_provider:
                 An optional `TracerProvider` instance to use for tracing. If not provided, the globally
                 configured tracer provider will be automatically used.
-            enable_commenter:
-                Optional flag to enable/disable sqlcommenter (default False).
-            commenter_options:
-                Optional configurations for tags to be appended at the sql query.
-            enable_attribute_commenter:
-                Optional flag to enable/disable addition of sqlcomment to span attribute (default False). Requires enable_commenter=True.
 
         Returns:
             An instrumented MySQL connection with OpenTelemetry tracing enabled.
@@ -230,10 +120,6 @@ def instrument_connection(
             self._CONNECTION_ATTRIBUTES,
             version=__version__,
             tracer_provider=tracer_provider,
-            enable_commenter=enable_commenter,
-            commenter_options=commenter_options,
-            connect_module=mysql.connector,
-            enable_attribute_commenter=enable_attribute_commenter,
         )
 
     def uninstrument_connection(self, connection):