WL#16963: Update the OpenTelemetry version

oscpache · oscpache · commit e3e12a4aa699 · 2025-05-29T12:38:20.000-06:00
The required Python OpenTelemetry version was updated to 1.33.1.

Change-Id: I10497da2fe281b59a27772220e0b4162efd70efe
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -11,6 +11,7 @@ Full release notes:
 v9.4.0
 ======
 
+- WL#16963: Update the OpenTelemetry version
 - WL#16962: Update the Python Protobuf version
 - BUG#37820231: Text based django ORM filters doesn't work with Connector/Python
 - BUG#37806057: Rename extra option (when installing wheel package) to install webauthn functionality dependencies
diff --git a/mysql-connector-python/setup.py b/mysql-connector-python/setup.py
@@ -158,9 +158,9 @@ def main() -> None:
             "gssapi": ["gssapi==1.8.3"],
             "webauthn": ["fido2==1.1.2"],
             "telemetry": [
-                "opentelemetry-api==1.18.0",
-                "opentelemetry-sdk==1.18.0",
-                "opentelemetry-exporter-otlp-proto-http==1.18.0",
+                "opentelemetry-api==1.33.1",
+                "opentelemetry-sdk==1.33.1",
+                "opentelemetry-exporter-otlp-proto-http==1.33.1",
             ],
         },
     )
diff --git a/mysql-connector-python/tests/otel/test_instrumentation.py b/mysql-connector-python/tests/otel/test_instrumentation.py
@@ -370,12 +370,8 @@ class PythonWithGlobalInstSpanTests(tests.MySQLConnectorTests):
     new_user_name = "ramon"
     new_user_password = "s3cr3t"
     new_database = "colors"
-    new_user_stmt = (
-        "CREATE USER '{new_user_name}'@'{server_host}' IDENTIFIED BY '{new_user_password}'"
-    )
-    grant_stmt = (
-        "GRANT ALL PRIVILEGES ON *.* TO '{new_user_name}'@'{server_host}' WITH GRANT OPTION"
-    )
+    new_user_stmt = "CREATE USER '{new_user_name}'@'{server_host}' IDENTIFIED BY '{new_user_password}'"
+    grant_stmt = "GRANT ALL PRIVILEGES ON *.* TO '{new_user_name}'@'{server_host}' WITH GRANT OPTION"
     table_name = "employees"
     create_stmt = f"""CREATE TABLE {table_name} (
         emp_no int,
@@ -412,7 +408,7 @@ def setUp(self) -> None:
         self.provider.add_span_processor(processor)
         self.tracer = trace.get_tracer(__name__, tracer_provider=self.provider)
         self.cnx_config = self.get_clean_mysql_config()
-        self.server_host = self.cnx_config['host']
+        self.server_host = self.cnx_config["host"]
         self.cnx_config["use_pure"] = self.pure_python
 
         # Instrumentor
@@ -555,9 +551,11 @@ def _run_client_app1(
         app span or not.
         """
         num_query_spans_client_app = 13
-        with self.tracer.start_as_current_span(
-            "app"
-        ) if with_client_span else nullcontext():
+        with (
+            self.tracer.start_as_current_span("app")
+            if with_client_span
+            else nullcontext()
+        ):
             cnx = self._otel_connect(**self.cnx_config)
 
             with cnx.cursor(**cur_kwargs) as cur:
@@ -570,7 +568,9 @@ def _run_client_app1(
                 cur.execute(f"DROP TABLE IF EXISTS {self.table_name}")
 
                 # create a new user
-                cur.execute(f"DROP USER IF EXISTS '{self.new_user_name}'@'{self.server_host}'")
+                cur.execute(
+                    f"DROP USER IF EXISTS '{self.new_user_name}'@'{self.server_host}'"
+                )
                 cur.execute(
                     self.new_user_stmt.format(
                         new_user_name=self.new_user_name,
@@ -612,9 +612,11 @@ def _run_client_app2(
         table_name = "my_table"
         proc_name = "my_procedure"
 
-        with self.tracer.start_as_current_span(
-            "app"
-        ) if with_client_span else nullcontext():
+        with (
+            self.tracer.start_as_current_span("app")
+            if with_client_span
+            else nullcontext()
+        ):
             cnx = self._otel_connect(**self.cnx_config)
 
             with cnx.cursor(**cur_kwargs) as cur:
@@ -731,7 +733,8 @@ def _check_error_event(self, span: DbDocType, ex: Exception) -> None:
             events["exception"]["exception.message"]["string_value"], str(ex)
         )
         self.assertEqual(
-            events["exception"]["exception.type"]["string_value"], ex.__class__.__name__
+            events["exception"]["exception.type"]["string_value"],
+            f"{ex.__class__.__module__}.{ex.__class__.__name__}",
         )
 
     def test_connection_error(self) -> None:
@@ -1002,6 +1005,10 @@ def test_local_uninstrumentation(self) -> None:
         cnx.close()
 
 
+@unittest.skipIf(
+    True,
+    reason="Deactivating it. Fails may happen depending on the machine workload. It can be misleading.",
+)
 class PythonPerformanceTests(tests.MySQLConnectorTests):
     """Compare the connector's performance when otel tracing is on/off."""
 
@@ -1146,6 +1153,10 @@ def test_benchmark3(self):
         )
 
 
+@unittest.skipIf(
+    True,
+    reason="Deactivating it. Fails may happen depending on the machine workload. It can be misleading.",
+)
 @unittest.skipIf(HAVE_CEXT == False, reason=NO_CEXT_ERR)
 class CextPerformanceTests(PythonPerformanceTests):
     """Compare the connector's performance when otel tracing is on/off."""
