Add mysql_client_version to sqlcomment

tammy-baylis-swi · tammy-baylis-swi · commit cec3a8642012 · 2024-10-09T14:42:24.000-07:00
diff --git a/instrumentation/opentelemetry-instrumentation-dbapi/src/opentelemetry/instrumentation/dbapi/__init__.py b/instrumentation/opentelemetry-instrumentation-dbapi/src/opentelemetry/instrumentation/dbapi/__init__.py
@@ -458,21 +458,16 @@ def traced_execution(
                                 "libpq_version": libpq_version,
                             }
                         )
-
-                    elif self._db_api_integration.database_system == "mysql":
-                        db_driver = self._db_api_integration.connect_module.__name__
-                        
+                    elif self._db_api_integration.database_system == "mysql":                       
                         mysqlc_version = ""
                         if db_driver == "mysql.connector":
-                            # TODO Version of mysql.connector not same as mysql C API
-                            mysqlc_version = self._db_api_integration.connect_module.__version__
-                        elif db_driver == "MySQLdb":
-                            # TODO
-                            mysqlc_version = "TODO"
+                            mysqlc_version = cursor._cnx._cmysql.get_client_info()
+                        if db_driver == "MySQLdb":
+                            mysqlc_version = self._db_api_integration.connect_module._mysql.get_client_info()
 
                         commenter_data.update(
                             {
-                                "mysqlc_version": mysqlc_version,
+                                "mysql_client_version": mysqlc_version,
                             }
                         )
 

Original file line number	Diff line number	Diff line change
`@@ -458,21 +458,16 @@ def traced_execution(`
`458`	`458`	`"libpq_version": libpq_version,`
`459`	`459`	`}`
`460`	`460`	`)`
`461`		`-`
`462`		`- elif self._db_api_integration.database_system == "mysql":`
`463`		`- db_driver = self._db_api_integration.connect_module.__name__`
`464`		`-`
	`461`	`+ elif self._db_api_integration.database_system == "mysql":`
`465`	`462`	`mysqlc_version = ""`
`466`	`463`	`if db_driver == "mysql.connector":`
`467`		`- # TODO Version of mysql.connector not same as mysql C API`
`468`		`- mysqlc_version = self._db_api_integration.connect_module.__version__`
`469`		`- elif db_driver == "MySQLdb":`
`470`		`- # TODO`
`471`		`- mysqlc_version = "TODO"`
	`464`	`+ mysqlc_version = cursor._cnx._cmysql.get_client_info()`
	`465`	`+ if db_driver == "MySQLdb":`
	`466`	`+ mysqlc_version = self._db_api_integration.connect_module._mysql.get_client_info()`
`472`	`467`
`473`	`468`	`commenter_data.update(`
`474`	`469`	`{`
`475`		`- "mysqlc_version": mysqlc_version,`
	`470`	`+ "mysql_client_version": mysqlc_version,`
`476`	`471`	`}`
`477`	`472`	`)`
`478`	`473`