Merge branch 'main' into stash_gencontent_changes

Author: DylanRussell

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:

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

@@ -29,9 +29,9 @@ pytest-vcr==1.0.2
 pytest-asyncio==0.21.0
 wrapt==1.16.0
 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
 
 -e instrumentation-genai/opentelemetry-instrumentation-openai-v2
 -e util/opentelemetry-util-genai

instrumentation-genai/opentelemetry-instrumentation-openai-v2/tests/test_async_chat_completions.py

@@ -22,6 +22,7 @@
 
 from .test_utils import (
     DEFAULT_MODEL,
+    EXPECTED_TOOL_DEFINITIONS,
     USER_ONLY_EXPECTED_INPUT_MESSAGES,
     USER_ONLY_PROMPT,
     WEATHER_TOOL_EXPECTED_INPUT_MESSAGES,
@@ -616,6 +617,12 @@ async def chat_completion_tool_call(
                 spans[0].attributes["gen_ai.output.messages"], first_output
             )
 
+            assert_messages_attribute(
+                spans[0].attributes["gen_ai.tool.definitions"],
+                EXPECTED_TOOL_DEFINITIONS,
+            )
+            assert "gen_ai.tool.definitions" not in spans[1].attributes
+
             # second call
             del first_output[0]["finish_reason"]
             second_input = []
@@ -1271,6 +1278,10 @@ async def async_chat_completion_multiple_tools_streaming(
             assert_messages_attribute(
                 spans[0].attributes["gen_ai.output.messages"], first_output
             )
+            assert_messages_attribute(
+                spans[0].attributes["gen_ai.tool.definitions"],
+                EXPECTED_TOOL_DEFINITIONS,
+            )
     else:
         assert len(logs) == 3
 

instrumentation-genai/opentelemetry-instrumentation-openai-v2/tests/test_chat_completions.py

@@ -36,6 +36,7 @@
 
 from .test_utils import (
     DEFAULT_MODEL,
+    EXPECTED_TOOL_DEFINITIONS,
     USER_ONLY_EXPECTED_INPUT_MESSAGES,
     USER_ONLY_PROMPT,
     WEATHER_TOOL_EXPECTED_INPUT_MESSAGES,
@@ -747,6 +748,12 @@ def chat_completion_tool_call(
                 spans[0].attributes["gen_ai.output.messages"], first_output
             )
 
+            assert_messages_attribute(
+                spans[0].attributes["gen_ai.tool.definitions"],
+                EXPECTED_TOOL_DEFINITIONS,
+            )
+            assert "gen_ai.tool.definitions" not in spans[1].attributes
+
             # second call
             del first_output[0]["finish_reason"]
             second_input = []
@@ -1416,6 +1423,10 @@ def chat_completion_multiple_tools_streaming(
             assert_messages_attribute(
                 spans[0].attributes["gen_ai.output.messages"], first_output
             )
+            assert_messages_attribute(
+                spans[0].attributes["gen_ai.tool.definitions"],
+                EXPECTED_TOOL_DEFINITIONS,
+            )
     else:
         assert len(logs) == 3