Merge branch 'main' into feat/strarlette_exclude_spans

Author: Fiery-Fenix

.github/workflows/generate_workflows_lib/src/generate_workflows_lib/misc.yml.j2

@@ -68,6 +68,12 @@ jobs:
       - name: Install tox
         run: pip install tox-uv
 
+      {%- if job_data == "docker-tests" %}
+
+      - name: Install Microsoft SQL ODBC driver
+        run: sudo apt update -y && ACCEPT_EULA=Y sudo apt install -y msodbcsql18 unixodbc-dev unixodbc
+      {%- endif %}
+
       - name: Run tests
         run: tox -e {{ job_data }}
       {%- if job_data == "generate-workflows" %}

.github/workflows/misc.yml

@@ -59,6 +59,9 @@ jobs:
       - name: Install tox
         run: pip install tox-uv
 
+      - name: Install Microsoft SQL ODBC driver
+        run: sudo apt update -y && ACCEPT_EULA=Y sudo apt install -y msodbcsql18 unixodbc-dev unixodbc
+
       - name: Run tests
         run: tox -e docker-tests
 

CHANGELOG.md

@@ -12,11 +12,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## Unreleased
 
 ### Added
+
 - Add `BaggageLogProcessor` to `opentelemetry-processor-baggage`
   ([#4371](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4371))
-
 - `opentelemetry-instrumentation-system-metrics`: Add support for `process.disk.io` metric in system-metrics instrumentation
-  ([#4397](https://github.com/open-telemetry/opentelemetry-python-contrib/issues/4397))
+  ([#4397](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4397))
 - Switch to SPDX license headers and add CI enforcement
   ([#4533](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4533))
 - Bump `pylint` to `4.0.5`
@@ -31,6 +31,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#3839](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3839))
 - `opentelemetry-exporter-richconsole`: Add support for suppressing resource information
   ([#3898](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3898))
+- `opentelemetry-instrumentation`: Add experimental metrics attributes Labeler utility
+  ([#4288](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4288))
 
 ### Fixed
 
@@ -46,13 +48,25 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#4360](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4360))
 - `opentelemetry-instrumentation-aiohttp-server`: Use `canonical` attribute of the `Resource` as a span name
   ([#3896](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3896))
+- `docker-tests`: Don't require sudo, debian based distro and MS SQL ODBC driver to run locally. Instead require docker and unixodbc
+  ([#4478](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4478))
 - Refactor unit tests to allow for population of the random trace id flag in the `traceparent` header
   ([#4030](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4030))
+- `opentelemetry-instrumentation-fastapi`: Fix `FastAPI` instrumentation to correctly trace `BackgroundTasks` by wrapping their execution in a dedicated span, ensuring proper parent-child relationships and accurate trace timing
+  ([#4368](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4368))
+- `opentelemetry-instrumentation-celery`: Coerce timelimit values to strings in `set_attributes_from_context()` to prevent mixed-type span attribute warning
+  ([#4361](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4361))
+- `opentelemetry-instrumentation-mysqlclient`: Update unit tests to properly validate trace context trace flag values.
+  ([#4560](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4560))
 
 ### Breaking changes
 
 - Drop Python 3.9 support
   ([#4412](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4412))
+- `opentelemetry-instrumentation-logging`: Use `LogRecord.getMessage()` to format and extract each log record's body text to more closely match the expected usage of the logging system. As a result, all OTel log record bodies are now always strings.
+  Previously, if `LogRecord.msg` (which contains the format string) was set to a non-string object (e.g. `logger.warning(some_dict)`), the object was exported as-is to the OTLP body field. Now, `LogRecord.getMessage()` will convert it to to a string.
+  If you are passing in non-strings as the format string argument and your backend is expecting them as-is, you will need to update accordingly.
+  ([#4372](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4372))
 
 ## Version 1.41.0/0.62b0 (2026-04-09)
 
@@ -72,13 +86,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#4049](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4049))
 - `opentelemetry-instrumentation-sqlalchemy`: implement new semantic convention opt-in migration
   ([#4110](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4110))
-- `opentelemetry-instrumentation`: Add experimental metrics attributes Labeler utility
-  ([#4288](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4288))
 
 ### Fixed
 
-- `opentelemetry-instrumentation-celery`: Coerce timelimit values to strings in `set_attributes_from_context()` to prevent mixed-type span attribute warning
-  ([#4361](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4361))
 - `opentelemetry-docker-tests`: Replace deprecated `SpanAttributes` from `opentelemetry.semconv.trace` with `opentelemetry.semconv._incubating.attributes`
  ([#4339](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4339))
 - `opentelemetry-instrumentation-confluent-kafka`: Skip `recv` span creation when `poll()` returns no message or `consume()` returns an empty list, avoiding empty spans on idle polls
@@ -93,8 +103,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#4302](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4302))
 - `opentelemetry-instrumentation-grpc`: Fix bidirectional streaming RPCs raising `AttributeError: 'generator' object has no attribute 'add_done_callback'`
   ([#4259](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4259))
-- `opentelemetry-instrumentation-fastapi`: Fix `FastAPI` instrumentation to correctly trace `BackgroundTasks` by wrapping their execution in a dedicated span, ensuring proper parent-child relationships and accurate trace timing
-  ([#4368](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4368))
 - `opentelemetry-instrumentation-aiokafka`: fix `Unclosed AIOKafkaProducer` warning and `RuntimeWarning: coroutine was never awaited` in tests
   ([#4384](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4384))
 - `opentelemetry-instrumentation-aiokafka`: Fix compatibility with aiokafka 0.13 by calling
@@ -106,10 +114,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - `opentelemetry-instrumentation-boto`: Remove instrumentation
   ([#4303](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4303))
-- `opentelemetry-instrumentation-logging`: Use `LogRecord.getMessage()` to format and extract each log record's body text to more closely match the expected usage of the logging system. As a result, all OTel log record bodies are now always strings.
-  Previously, if `LogRecord.msg` (which contains the format string) was set to a non-string object (e.g. `logger.warning(some_dict)`), the object was exported as-is to the OTLP body field. Now, `LogRecord.getMessage()` will convert it to to a string.
-  If you are passing in non-strings as the format string argument and your backend is expecting them as-is, you will need to update accordingly.
-  ([#4372](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4372))
 
 ## Version 1.40.0/0.61b0 (2026-03-04)
 

instrumentation/opentelemetry-instrumentation-mysqlclient/tests/test_mysqlclient_integration.py

@@ -143,9 +143,10 @@ def test_instrument_connection_with_dbapi_sqlcomment_enabled(self):
             span = spans_list[0]
             span_id = format(span.get_span_context().span_id, "016x")
             trace_id = format(span.get_span_context().trace_id, "032x")
+            trace_flags = format(span.get_span_context().trace_flags, "02x")
             self.assertEqual(
                 mock_cursor.execute.call_args[0][0],
-                f"Select 1 /*db_driver='MySQLdb%%3Afoobar',dbapi_level='123',dbapi_threadsafety='123',driver_paramstyle='test',mysql_client_version='foobaz',traceparent='00-{trace_id}-{span_id}-01'*/;",
+                f"Select 1 /*db_driver='MySQLdb%%3Afoobar',dbapi_level='123',dbapi_threadsafety='123',driver_paramstyle='test',mysql_client_version='foobaz',traceparent='00-{trace_id}-{span_id}-{trace_flags}'*/;",
             )
             self.assertEqual(
                 span.attributes[DB_STATEMENT],
@@ -194,7 +195,7 @@ def test_instrument_connection_with_dbapi_sqlcomment_enabled_stmt_enabled(
             )
             self.assertEqual(
                 span.attributes[DB_STATEMENT],
-                f"Select 1 /*db_driver='MySQLdb%%3Afoobar',dbapi_level='123',dbapi_threadsafety='123',driver_paramstyle='test',mysql_client_version='foobaz',traceparent='00-{trace_id}-{span_id}-01'*/;",
+                f"Select 1 /*db_driver='MySQLdb%%3Afoobar',dbapi_level='123',dbapi_threadsafety='123',driver_paramstyle='test',mysql_client_version='foobaz',traceparent='00-{trace_id}-{span_id}-{trace_flags}'*/;",
             )
 
     def test_instrument_connection_with_dbapi_sqlcomment_enabled_with_options(
@@ -391,7 +392,7 @@ def test_instrument_with_dbapi_sqlcomment_enabled_stmt_enabled(
             )
             self.assertEqual(
                 span.attributes[DB_STATEMENT],
-                f"Select 1 /*db_driver='MySQLdb%%3Afoobar',dbapi_level='123',dbapi_threadsafety='123',driver_paramstyle='test',mysql_client_version='foobaz',traceparent='00-{trace_id}-{span_id}-01'*/;",
+                f"Select 1 /*db_driver='MySQLdb%%3Afoobar',dbapi_level='123',dbapi_threadsafety='123',driver_paramstyle='test',mysql_client_version='foobaz',traceparent='00-{trace_id}-{span_id}-{trace_flags}'*/;",
             )
 
     def test_instrument_with_dbapi_sqlcomment_enabled_with_options(

tests/opentelemetry-docker-tests/tests/check_availability.py

@@ -130,8 +130,11 @@ def check_docker_services_availability():
     check_mysql_connection()
     check_postgres_connection()
     check_redis_connection()
-    check_mssql_connection()
-    setup_mssql_db()
+
+    # make accepting EULA for ms sql odbc driver optional
+    if "ODBC Driver 18 for SQL Server" in pyodbc.drivers():
+        check_mssql_connection()
+        setup_mssql_db()
 
 
 check_docker_services_availability()

tests/opentelemetry-docker-tests/tests/docker-compose.yml

@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   otmongo:
     ports:

tests/opentelemetry-docker-tests/tests/sqlalchemy_tests/test_mssql.py

@@ -3,6 +3,7 @@
 
 import os
 
+import pyodbc
 import pytest
 from sqlalchemy.exc import ProgrammingError
 
@@ -30,6 +31,10 @@
 }
 
 
+@pytest.mark.skipif(
+    "ODBC Driver 18 for SQL Server" not in pyodbc.drivers(),
+    reason="No MS SQL ODBC driver installed",
+)
 class MssqlConnectorTestCase(SQLAlchemyTestMixin):
     """TestCase for pyodbc engine"""
 

tests/opentelemetry-docker-tests/tests/test-requirements.txt

@@ -3,7 +3,6 @@ amqp==5.2.0
 asgiref==3.8.1
 async-timeout==4.0.3
 asyncpg==0.29.0
-attrs==23.2.0
 bcrypt==5.0.0
 billiard==4.2.0
 celery==5.3.6
@@ -15,21 +14,15 @@ click-didyoumean==0.3.0
 click-plugins==1.1.1
 click-repl==0.3.0
 cryptography==46.0.7
-distro==1.9.0
 Django==4.2.30
 dnspython==2.6.1
-docker==5.0.3
-docker-compose==1.29.2
-dockerpty==0.4.1
-docopt==0.6.2
 exceptiongroup==1.2.0
 flaky==3.7.0
 flask==3.1.3
 greenlet==3.0.3
 grpcio==1.63.2
 idna==3.7
 iniconfig==2.0.0
-jsonschema==3.2.0
 kombu==5.3.5
 mysql-connector-python==8.3.0
 mysqlclient==2.1.1
@@ -50,24 +43,19 @@ PyMySQL==1.1.1
 PyNaCl==1.6.2
 # prerequisite: install unixodbc
 pyodbc==5.0.1
-pyrsistent==0.20.0
 pytest==8.0.2
 pytest-celery==0.0.0
 python-dateutil==2.9.0.post0
-python-dotenv==0.21.1
 pytz==2024.1
-PyYAML==5.3.1
 redis==5.0.1
 requests==2.31.0
 six==1.16.0
 SQLAlchemy==1.4.52
-texttable==1.7.0
 tomli==2.0.1
 typing_extensions==4.12.2
 tzdata==2024.1
-urllib3==1.26.19
+urllib3==2.6.3
 vine==5.1.0
 wcwidth==0.2.13
-websocket-client==0.59.0
 wrapt==1.16.0
 zipp==3.19.1

tox.ini

@@ -1082,17 +1082,21 @@ deps =
 changedir =
   tests/opentelemetry-docker-tests/tests
 
+allowlist_externals =
+  docker
+  pytest
+
 commands_pre =
-  sh -c "sudo apt update -y && sudo ACCEPT_EULA=Y apt-get install -y msodbcsql18 unixodbc-dev unixodbc"
-  python -c "import pyodbc; print(pyodbc.drivers())"
-  docker-compose up -d
+  docker --version || echo 'Docker with compose subcommand is required' && /bin/false
+  python -c 'import pyodbc; print(pyodbc.drivers())' || echo 'You need to install unixODBC' && /bin/false
+  docker compose up -d
   python check_availability.py
 
 commands =
   pytest {posargs}
 
 commands_post =
-  docker-compose down -v
+  docker compose down -v
 
 [testenv:generate]
 deps =