bug_fix(1477): updated type handling for _add_sql_comment

Author: aryabharat

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

@@ -491,6 +491,8 @@ def _update_args_with_added_sql_comment(self, args, cursor) -> tuple:
             # 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

@@ -84,6 +84,8 @@ def __call__(self, execute: Type[T], sql, params, many, context) -> T:
         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-sqlalchemy/src/opentelemetry/instrumentation/sqlalchemy/engine.py

@@ -274,9 +274,9 @@ def _before_cur_exec(
                     commenter_data = self._get_commenter_data(conn)
 
                     if self.enable_attribute_commenter:
-                        # Convert sql statement to string, handling  psycopg2.sql.Composable object
-                        if hasattr(statement, "as_string"):
-                            statement = statement.as_string(conn)
+                        # just to handle type safety
+                        statement = str(statement)
+
                         # sqlcomment is added to executed query and db.statement span attribute
                         statement = _add_sql_comment(
                             statement, **commenter_data