mysql uses updated dbapi.instrument_connection

Author: tammy-baylis-swi

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

@@ -111,7 +111,6 @@
 import typing
 
 import mysql.connector
-import wrapt
 
 from opentelemetry import trace as trace_api
 from opentelemetry.instrumentation import dbapi
@@ -180,22 +179,19 @@ def instrument_connection(
         Returns:
             An instrumented connection.
         """
-        if isinstance(connection, wrapt.ObjectProxy):
-            _logger.warning("Connection already instrumented")
-            return connection
-
-        db_integration = DatabaseApiIntegration(
+        return dbapi.instrument_connection(
             __name__,
+            connection,
             self._DATABASE_SYSTEM,
             self._CONNECTION_ATTRIBUTES,
             version=__version__,
             tracer_provider=tracer_provider,
             enable_commenter=enable_commenter,
             commenter_options=commenter_options,
             connect_module=mysql.connector,
+            db_api_integration_factory=DatabaseApiIntegration,
+            get_cnx_proxy=get_traced_connection_proxy,
         )
-        db_integration.get_connection_attributes(connection)
-        return get_traced_connection_proxy(connection, db_integration)
 
     def uninstrument_connection(
         self,