Merge branch 'main' into doc-fastapi-doc-holes

Author: Harshal96

.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,15 +12,15 @@ 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-fastapi`: Clarify documentation for zero-code setup, propagation, and logs
   ([#4555](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4555))
 - `opentelemetry-instrumentation`: Include the package README in the generated documentation
   ([#4555](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4555))
+- 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`
@@ -35,6 +35,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
 
@@ -50,11 +52,23 @@ 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))
 
 ### 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)
 
@@ -74,13 +88,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

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

@@ -25,9 +25,9 @@ classifiers = [
   "Programming Language :: Python :: 3.14",
 ]
 dependencies = [
-  "opentelemetry-api ~= 1.39",
-  "opentelemetry-instrumentation ~= 0.60b0",
-  "opentelemetry-semantic-conventions ~= 0.60b0",
+  "opentelemetry-api ~= 1.40",
+  "opentelemetry-instrumentation ~= 0.61b0",
+  "opentelemetry-semantic-conventions ~= 0.61b0",
   "opentelemetry-util-genai >= 0.4b0.dev, <0.5b0",
 ]
 

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

@@ -21,8 +21,8 @@ pytest==7.4.4
 pytest-vcr==1.0.2
 pytest-asyncio==0.21.0
 wrapt==1.16.0
-opentelemetry-api==1.39  # when updating, also update in pyproject.toml
-opentelemetry-sdk==1.39  # when updating, also update in pyproject.toml
-opentelemetry-semantic-conventions==0.60b0  # when updating, also update in pyproject.toml
+opentelemetry-api==1.40  # when updating, also update in pyproject.toml
+opentelemetry-sdk==1.40  # when updating, also update in pyproject.toml
+opentelemetry-semantic-conventions==0.61b0  # when updating, also update in pyproject.toml
 
 -e instrumentation-genai/opentelemetry-instrumentation-anthropic

instrumentation-genai/opentelemetry-instrumentation-openai-agents-v2/pyproject.toml

@@ -25,9 +25,9 @@ classifiers = [
   "Programming Language :: Python :: 3.14",
 ]
 dependencies = [
-  "opentelemetry-api >= 1.39",
-  "opentelemetry-instrumentation >= 0.58b0",
-  "opentelemetry-semantic-conventions >= 0.60b0",
+  "opentelemetry-api >= 1.40",
+  "opentelemetry-instrumentation >= 0.61b0",
+  "opentelemetry-semantic-conventions >= 0.61b0",
   "opentelemetry-util-genai >= 0.4b0.dev"
 ]
 

instrumentation-genai/opentelemetry-instrumentation-openai-agents-v2/tests/requirements.oldest.txt

@@ -26,9 +26,9 @@ pytest-asyncio==0.21.0
 wrapt==1.16.0
 opentelemetry-exporter-otlp-proto-grpc~=1.30
 opentelemetry-exporter-otlp-proto-http~=1.30
-opentelemetry-api==1.39  # when updating, also update in pyproject.toml
-opentelemetry-sdk==1.39  # when updating, also update in pyproject.toml
-opentelemetry-semantic-conventions==0.60b0  # when updating, also update in pyproject.toml
+opentelemetry-api==1.40  # when updating, also update in pyproject.toml
+opentelemetry-sdk==1.40  # when updating, also update in pyproject.toml
+opentelemetry-semantic-conventions==0.61b0  # when updating, also update in pyproject.toml
 grpcio>=1.60.0; implementation_name != "pypy"
 grpcio<1.60.0; implementation_name == "pypy"
 

instrumentation-genai/opentelemetry-instrumentation-openai-v2/CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+- Pass tool definitions from `tools` kwarg to `InferenceInvocation.tool_definitions`
+  so `gen_ai.tool.definitions` span attribute is populated on chat completion spans
+  ([#4554](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4554))
+
 ## Version 2.4b0 (2026-05-01)
 
 

instrumentation-genai/opentelemetry-instrumentation-openai-v2/pyproject.toml

@@ -25,9 +25,9 @@ classifiers = [
   "Programming Language :: Python :: 3.14",
 ]
 dependencies = [
-  "opentelemetry-api ~= 1.39",
-  "opentelemetry-instrumentation ~= 0.60b0",
-  "opentelemetry-semantic-conventions ~= 0.60b0",
+  "opentelemetry-api ~= 1.40",
+  "opentelemetry-instrumentation ~= 0.61b0",
+  "opentelemetry-semantic-conventions ~= 0.61b0",
   "opentelemetry-util-genai >= 0.4b0.dev",
 ]
 

instrumentation-genai/opentelemetry-instrumentation-openai-v2/src/opentelemetry/instrumentation/openai_v2/utils.py

@@ -32,11 +32,13 @@
 from opentelemetry.util.genai.handler import TelemetryHandler
 from opentelemetry.util.genai.invocation import InferenceInvocation
 from opentelemetry.util.genai.types import (
+    FunctionToolDefinition,
     InputMessage,
     OutputMessage,
     Text,
     ToolCallRequest,
     ToolCallResponse,
+    ToolDefinition,
 )
 
 _OpenAIOmit = getattr(openai, "Omit", None)
@@ -397,6 +399,9 @@ def create_chat_invocation(
         invocation.input_messages = _prepare_input_messages(
             kwargs.get("messages", [])
         )
+        invocation.tool_definitions = _prepare_tool_definitions(
+            kwargs.get("tools")
+        )
     return invocation
 
 
@@ -475,6 +480,26 @@ def extract_tool_calls_new(tool_calls) -> list[ToolCallRequest]:
     return parts
 
 
+def _prepare_tool_definitions(tools) -> list[ToolDefinition] | None:
+    if not tools:
+        return None
+
+    definitions: list[ToolDefinition] = []
+    for tool in tools:
+        tool_type = get_property_value(tool, "type")
+        if tool_type == "function":
+            func = get_property_value(tool, "function")
+            if func:
+                definitions.append(
+                    FunctionToolDefinition(
+                        name=get_property_value(func, "name") or "",
+                        description=get_property_value(func, "description"),
+                        parameters=get_property_value(func, "parameters"),
+                    )
+                )
+    return definitions
+
+
 def _prepare_output_messages(choices) -> List[OutputMessage]:
     output_messages = []
     for choice in choices: