Merge branch 'main' into add-claude-md

Author: Kludex

.github/component_owners.yml

@@ -25,15 +25,6 @@ components:
   instrumentation/opentelemetry-instrumentation-urllib3:
     - shalevr
 
-  instrumentation-genai/:
-    - karthikscale3
-    - lmolkova
-    - lzchen
-    - gyliu513
-    - nirga
-    - alizenhom
-    - codefromthecrypt
-
   processor/opentelemetry-processor-baggage:
     - codeboten
 
@@ -45,8 +36,10 @@ components:
     - jj22ee
 
   util/opentelemetry-util-genai:
+    - Cirilla-zmh
     - DylanRussell
     - keith-decker
+    - lmolkova
 
   instrumentation-genai/opentelemetry-instrumentation-langchain:
     - zhirafovod
@@ -55,6 +48,9 @@ components:
   instrumentation-genai/opentelemetry-instrumentation-openai-agents-v2:
     - nagkumar91
 
+  instrumentation-genai/opentelemetry-instrumentation-openai-v2:
+    - lmolkova
+
   instrumentation-genai/opentelemetry-instrumentation-anthropic:
     - vasantteja
     - anirudha

.github/workflows/package-prepare-release.yml

@@ -33,6 +33,8 @@ jobs:
       next_version: ${{ steps.verify.outputs.next_version }}
     steps:
       - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
       - id: verify
         name: Verify prerequisites

CHANGELOG.md

@@ -59,7 +59,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#4139](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4139))
 
 ### Fixed
-
+- `opentelemetry-instrumentation-mysql`: Refactor MySQL integration test mocks to use concrete DBAPI connection attributes, reducing noisy attribute type warnings.
+  ([#4116](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4116))
 - `opentelemetry-instrumentation-cassandra`: Use `_instruments_any` instead of `_instruments` for driver dependencies so that having either `cassandra-driver` or `scylla-driver` installed is sufficient
   ([#4182](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4182))
 - `opentelemetry-instrumentation-asyncpg`: Hydrate span attributes before creation so samplers can filter on database details

instrumentation-genai/opentelemetry-instrumentation-google-genai/CHANGELOG.md

@@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## Unreleased
+
+## Version 0.7b0 (2026-02-20)
 - Fix bug in how tokens are counted when using the streaming `generateContent` method.  ([#4152](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4152)).
 - Add `gen_ai.tool.definitions` attribute to `gen_ai.client.inference.operation.details` log event ([#4142](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4142)).
 - Add `gen_ai.tool_definitions` to completion hook ([#4181](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4181))

instrumentation-genai/opentelemetry-instrumentation-google-genai/pyproject.toml

@@ -42,7 +42,7 @@ dependencies = [
   "opentelemetry-api ~=1.37",
   "opentelemetry-instrumentation >=0.58b0, <2",
   "opentelemetry-semantic-conventions >=0.58b0, <2",
-  "opentelemetry-util-genai >= 0.2b0, <0.4b0", # TODO: update version after release (https://github.com/open-telemetry/opentelemetry-python-contrib/issues/4221)
+  "opentelemetry-util-genai >= 0.3b0, <0.4b0",
 ]
 
 [project.optional-dependencies]

instrumentation-genai/opentelemetry-instrumentation-google-genai/src/opentelemetry/instrumentation/google_genai/version.py

@@ -17,4 +17,4 @@
 #   This version should stay below "1.0" until the fundamentals
 #   in "TODOS.md" have been addressed. Please revisit the TODOs
 #   listed there before bumping to a stable version.
-__version__ = "0.7b0.dev"
+__version__ = "0.8b0.dev"

instrumentation-genai/opentelemetry-instrumentation-google-genai/tests/requirements.oldest.txt

@@ -25,13 +25,10 @@ opentelemetry-api==1.37.0
 opentelemetry-sdk==1.37.0
 opentelemetry-semantic-conventions==0.58b0
 opentelemetry-instrumentation==0.58b0
-# TODO: uncomment and update version after release (https://github.com/open-telemetry/opentelemetry-python-contrib/issues/4221) 
-# opentelemetry-util-genai[upload]==0.2b0
+opentelemetry-util-genai[upload]==0.3b0
 
 fsspec==2025.9.0
 
 # Install locally from the folder. This path is relative to the
 # root directory, given invocation from "tox" at root level.
 -e instrumentation-genai/opentelemetry-instrumentation-google-genai
-# TODO: remove local install after release (https://github.com/open-telemetry/opentelemetry-python-contrib/issues/4221)
--e util/opentelemetry-util-genai[upload]

instrumentation/opentelemetry-instrumentation-mysql/tests/test_mysql_integration.py

@@ -35,6 +35,50 @@ def connect_and_execute_query():
     return cnx, query
 
 
+def make_mysql_connection_mock():
+    cnx = mock.MagicMock()
+    cnx.database = "test"
+    cnx.server_host = "localhost"
+    cnx.server_port = 3306
+
+    cursor = mock.MagicMock()
+    cursor._cnx = cnx
+
+    cnx.cursor.return_value = cursor
+    return cnx
+
+
+def make_mysql_commenter_mocks(client_version="foobaz"):
+    """Create mock objects for MySQL connector with SQL commenter support.
+
+    Args:
+        client_version: The MySQL client version string to return from get_client_info()
+
+    Returns:
+        Tuple of (mock_connect_module, mock_connection, mock_cursor)
+    """
+    mock_connect_module = mock.MagicMock(
+        __name__="mysql.connector",
+        __version__="foobar",
+        threadsafety="123",
+        apilevel="123",
+        paramstyle="test",
+    )
+    mock_connection = mock.MagicMock()
+    mock_connection.database = "test"
+    mock_connection.server_host = "localhost"
+    mock_connection.server_port = 3306
+
+    mock_cursor = mock_connect_module.connect().cursor()
+    mock_cursor._cnx = mock_connection
+    mock_cursor._cnx._cmysql.get_client_info.return_value = client_version
+
+    mock_connection.cursor.return_value = mock_cursor
+    mock_connect_module.connect.return_value = mock_connection
+
+    return mock_connect_module, mock_connection, mock_cursor
+
+
 class TestMysqlIntegration(TestBase):
     def tearDown(self):
         super().tearDown()
@@ -44,6 +88,7 @@ def tearDown(self):
     @mock.patch("mysql.connector.connect")
     # pylint: disable=unused-argument
     def test_instrumentor(self, mock_connect):
+        mock_connect.return_value = make_mysql_connection_mock()
         MySQLInstrumentor().instrument()
 
         connect_and_execute_query()
@@ -68,6 +113,7 @@ def test_instrumentor(self, mock_connect):
     @mock.patch("mysql.connector.connect")
     # pylint: disable=unused-argument
     def test_custom_tracer_provider(self, mock_connect):
+        mock_connect.return_value = make_mysql_connection_mock()
         resource = resources.Resource.create({})
         result = self.create_tracer_provider(resource=resource)
         tracer_provider, exporter = result
@@ -84,6 +130,7 @@ def test_custom_tracer_provider(self, mock_connect):
     @mock.patch("mysql.connector.connect")
     # pylint: disable=unused-argument
     def test_instrument_connection(self, mock_connect):
+        mock_connect.return_value = make_mysql_connection_mock()
         cnx, query = connect_and_execute_query()
 
         spans_list = self.memory_exporter.get_finished_spans()
@@ -98,6 +145,7 @@ def test_instrument_connection(self, mock_connect):
 
     @mock.patch("mysql.connector.connect")
     def test_instrument_connection_no_op_tracer_provider(self, mock_connect):
+        mock_connect.return_value = make_mysql_connection_mock()
         tracer_provider = trace_api.NoOpTracerProvider()
         MySQLInstrumentor().instrument(tracer_provider=tracer_provider)
         connect_and_execute_query()
@@ -128,17 +176,9 @@ def test_instrument_connection_enable_commenter_dbapi_kwargs(
         self.assertEqual(kwargs["enable_attribute_commenter"], True)
 
     def test_instrument_connection_with_dbapi_sqlcomment_enabled(self):
-        mock_connect_module = mock.MagicMock(
-            __name__="mysql.connector",
-            __version__="foobar",
-            threadsafety="123",
-            apilevel="123",
-            paramstyle="test",
+        mock_connect_module, mock_connection, mock_cursor = (
+            make_mysql_commenter_mocks()
         )
-        mock_cursor = mock_connect_module.connect().cursor()
-        mock_cursor._cnx._cmysql.get_client_info.return_value = "foobaz"
-        mock_connection = mock.MagicMock()
-        mock_connection.cursor.return_value = mock_cursor
 
         with mock.patch(
             "opentelemetry.instrumentation.mysql.mysql.connector",
@@ -166,17 +206,9 @@ def test_instrument_connection_with_dbapi_sqlcomment_enabled(self):
     def test_instrument_connection_with_dbapi_sqlcomment_enabled_stmt_enabled(
         self,
     ):
-        mock_connect_module = mock.MagicMock(
-            __name__="mysql.connector",
-            __version__="foobar",
-            threadsafety="123",
-            apilevel="123",
-            paramstyle="test",
+        mock_connect_module, mock_connection, mock_cursor = (
+            make_mysql_commenter_mocks()
         )
-        mock_cursor = mock_connect_module.connect().cursor()
-        mock_cursor._cnx._cmysql.get_client_info.return_value = "foobaz"
-        mock_connection = mock.MagicMock()
-        mock_connection.cursor.return_value = mock_cursor
 
         with mock.patch(
             "opentelemetry.instrumentation.mysql.mysql.connector",
@@ -205,17 +237,9 @@ def test_instrument_connection_with_dbapi_sqlcomment_enabled_stmt_enabled(
     def test_instrument_connection_with_dbapi_sqlcomment_enabled_with_options(
         self,
     ):
-        mock_connect_module = mock.MagicMock(
-            __name__="mysql.connector",
-            __version__="foobar",
-            threadsafety="123",
-            apilevel="123",
-            paramstyle="test",
+        mock_connect_module, mock_connection, mock_cursor = (
+            make_mysql_commenter_mocks()
         )
-        mock_cursor = mock_connect_module.connect().cursor()
-        mock_cursor._cnx._cmysql.get_client_info.return_value = "foobaz"
-        mock_connection = mock.MagicMock()
-        mock_connection.cursor.return_value = mock_cursor
 
         with mock.patch(
             "opentelemetry.instrumentation.mysql.mysql.connector",
@@ -248,18 +272,9 @@ def test_instrument_connection_with_dbapi_sqlcomment_enabled_with_options(
     def test_instrument_connection_with_dbapi_sqlcomment_not_enabled_default(
         self,
     ):
-        mock_connect_module = mock.MagicMock(
-            __name__="mysql.connector",
-            __version__="foobar",
-            threadsafety="123",
-            apilevel="123",
-            paramstyle="test",
+        mock_connect_module, mock_connection, mock_cursor = (
+            make_mysql_commenter_mocks()
         )
-        mock_cursor = mock_connect_module.connect().cursor()
-        mock_cursor._cnx._cmysql.get_client_info.return_value = "foobaz"
-        mock_cursor = mock_connect_module.connect().cursor()
-        mock_connection = mock.MagicMock()
-        mock_connection.cursor.return_value = mock_cursor
 
         with mock.patch(
             "opentelemetry.instrumentation.mysql.mysql.connector",
@@ -301,18 +316,7 @@ def test_instrument_enable_commenter_dbapi_kwargs(
     def test_instrument_with_dbapi_sqlcomment_enabled(
         self,
     ):
-        mock_connect_module = mock.MagicMock(
-            __name__="mysql.connector",
-            __version__="foobar",
-            threadsafety="123",
-            apilevel="123",
-            paramstyle="test",
-        )
-        mock_cursor = mock_connect_module.connect().cursor()
-        mock_cursor._cnx._cmysql.get_client_info.return_value = "foobaz"
-        mock_cursor = mock_connect_module.connect().cursor()
-        mock_connection = mock.MagicMock()
-        mock_connection.cursor.return_value = mock_cursor
+        mock_connect_module, _, mock_cursor = make_mysql_commenter_mocks()
 
         with mock.patch(
             "opentelemetry.instrumentation.mysql.mysql.connector",
@@ -341,18 +345,7 @@ def test_instrument_with_dbapi_sqlcomment_enabled(
     def test_instrument_with_dbapi_sqlcomment_enabled_stmt_enabled(
         self,
     ):
-        mock_connect_module = mock.MagicMock(
-            __name__="mysql.connector",
-            __version__="foobar",
-            threadsafety="123",
-            apilevel="123",
-            paramstyle="test",
-        )
-        mock_cursor = mock_connect_module.connect().cursor()
-        mock_cursor._cnx._cmysql.get_client_info.return_value = "foobaz"
-        mock_cursor = mock_connect_module.connect().cursor()
-        mock_connection = mock.MagicMock()
-        mock_connection.cursor.return_value = mock_cursor
+        mock_connect_module, _, mock_cursor = make_mysql_commenter_mocks()
 
         with mock.patch(
             "opentelemetry.instrumentation.mysql.mysql.connector",
@@ -382,18 +375,7 @@ def test_instrument_with_dbapi_sqlcomment_enabled_stmt_enabled(
     def test_instrument_with_dbapi_sqlcomment_enabled_with_options(
         self,
     ):
-        mock_connect_module = mock.MagicMock(
-            __name__="mysql.connector",
-            __version__="foobar",
-            threadsafety="123",
-            apilevel="123",
-            paramstyle="test",
-        )
-        mock_cursor = mock_connect_module.connect().cursor()
-        mock_cursor._cnx._cmysql.get_client_info.return_value = "foobaz"
-        mock_cursor = mock_connect_module.connect().cursor()
-        mock_connection = mock.MagicMock()
-        mock_connection.cursor.return_value = mock_cursor
+        mock_connect_module, _, mock_cursor = make_mysql_commenter_mocks()
 
         with mock.patch(
             "opentelemetry.instrumentation.mysql.mysql.connector",
@@ -427,18 +409,7 @@ def test_instrument_with_dbapi_sqlcomment_enabled_with_options(
     def test_instrument_with_dbapi_sqlcomment_not_enabled_default(
         self,
     ):
-        mock_connect_module = mock.MagicMock(
-            __name__="mysql.connector",
-            __version__="foobar",
-            threadsafety="123",
-            apilevel="123",
-            paramstyle="test",
-        )
-        mock_cursor = mock_connect_module.connect().cursor()
-        mock_cursor._cnx._cmysql.get_client_info.return_value = "foobaz"
-        mock_cursor = mock_connect_module.connect().cursor()
-        mock_connection = mock.MagicMock()
-        mock_connection.cursor.return_value = mock_cursor
+        mock_connect_module, _, mock_cursor = make_mysql_commenter_mocks()
 
         with mock.patch(
             "opentelemetry.instrumentation.mysql.mysql.connector",
@@ -462,6 +433,7 @@ def test_instrument_with_dbapi_sqlcomment_not_enabled_default(
     @mock.patch("mysql.connector.connect")
     # pylint: disable=unused-argument
     def test_uninstrument_connection(self, mock_connect):
+        mock_connect.return_value = make_mysql_connection_mock()
         MySQLInstrumentor().instrument()
         cnx, query = connect_and_execute_query()
 

util/opentelemetry-util-genai/CHANGELOG.md

@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## Version 0.3b0 (2026-02-20)
+
 - Add `gen_ai.tool_definitions` to completion hook ([#4181](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4181))
 - Add support for emitting inference events and enrich message types. ([#3994](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3994))
 - Add support for `server.address`, `server.port` on all signals and additional metric-only attributes

util/opentelemetry-util-genai/src/opentelemetry/util/genai/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.3b0.dev"
+__version__ = "0.4b0.dev"