Merge branch 'main' into pr1-enhance-toolcall-type

Author: keith-decker

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

@@ -26,16 +26,14 @@ classifiers = [
   "Programming Language :: Python :: 3.14",
 ]
 dependencies = [
-  "opentelemetry-api ~= 1.37",
-  "opentelemetry-instrumentation ~= 0.58b0",
-  "opentelemetry-semantic-conventions ~= 0.58b0",
+  "opentelemetry-api ~= 1.39",
+  "opentelemetry-instrumentation ~= 0.60b0",
+  "opentelemetry-semantic-conventions ~= 0.60b0",
   "opentelemetry-util-genai >= 0.2b0, <0.4b0",
 ]
 
 [project.optional-dependencies]
-instruments = [
-  "anthropic >= 0.51.0",
-]
+instruments = ["anthropic >= 0.51.0"]
 
 [project.entry-points.opentelemetry_instrumentor]
 anthropic = "opentelemetry.instrumentation.anthropic:AnthropicInstrumentor"
@@ -48,15 +46,10 @@ Repository = "https://github.com/open-telemetry/opentelemetry-python-contrib"
 path = "src/opentelemetry/instrumentation/anthropic/version.py"
 
 [tool.hatch.build.targets.sdist]
-include = [
-  "/src",
-  "/tests",
-  "/examples",
-]
+include = ["/src", "/tests", "/examples"]
 
 [tool.hatch.build.targets.wheel]
 packages = ["src/opentelemetry"]
 
 [tool.pytest.ini_options]
 testpaths = ["tests"]
-

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.37  # when updating, also update in pyproject.toml
-opentelemetry-sdk==1.37  # when updating, also update in pyproject.toml
-opentelemetry-semantic-conventions==0.58b0  # when updating, also update in pyproject.toml
+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
 
 -e instrumentation-genai/opentelemetry-instrumentation-anthropic

instrumentation-genai/opentelemetry-instrumentation-claude-agent-sdk/pyproject.toml

@@ -24,16 +24,14 @@ classifiers = [
   "Programming Language :: Python :: 3.13",
 ]
 dependencies = [
-  "opentelemetry-api ~= 1.37",
-  "opentelemetry-instrumentation ~= 0.58b0",
-  "opentelemetry-semantic-conventions ~= 0.58b0",
+  "opentelemetry-api ~= 1.39",
+  "opentelemetry-instrumentation ~= 0.60b0",
+  "opentelemetry-semantic-conventions ~= 0.60b0",
   "opentelemetry-util-genai >= 0.2b0, <0.4b0",
 ]
 
 [project.optional-dependencies]
-instruments = [
-  "claude-agent-sdk >= 0.1.14",
-]
+instruments = ["claude-agent-sdk >= 0.1.14"]
 
 [project.entry-points.opentelemetry_instrumentor]
 claude-agent-sdk = "opentelemetry.instrumentation.claude_agent_sdk:ClaudeAgentSDKInstrumentor"
@@ -46,11 +44,7 @@ Repository = "https://github.com/open-telemetry/opentelemetry-python-contrib"
 path = "src/opentelemetry/instrumentation/claude_agent_sdk/version.py"
 
 [tool.hatch.build.targets.sdist]
-include = [
-  "/src",
-  "/tests",
-  "/examples",
-]
+include = ["/src", "/tests", "/examples"]
 
 [tool.hatch.build.targets.wheel]
 packages = ["src/opentelemetry"]

instrumentation-genai/opentelemetry-instrumentation-claude-agent-sdk/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.37  # when updating, also update in pyproject.toml
-opentelemetry-sdk==1.37  # when updating, also update in pyproject.toml
-opentelemetry-semantic-conventions==0.58b0  # when updating, also update in pyproject.toml
+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
 
 -e instrumentation-genai/opentelemetry-instrumentation-claude-agent-sdk

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

@@ -26,16 +26,14 @@ classifiers = [
   "Programming Language :: Python :: 3.14",
 ]
 dependencies = [
-  "opentelemetry-api ~= 1.37",
-  "opentelemetry-instrumentation ~= 0.58b0",
-  "opentelemetry-semantic-conventions ~= 0.58b0",
+  "opentelemetry-api ~= 1.39",
+  "opentelemetry-instrumentation ~= 0.60b0",
+  "opentelemetry-semantic-conventions ~= 0.60b0",
   "opentelemetry-util-genai",
 ]
 
 [project.optional-dependencies]
-instruments = [
-  "openai >= 1.26.0",
-]
+instruments = ["openai >= 1.26.0"]
 
 [project.entry-points.opentelemetry_instrumentor]
 openai = "opentelemetry.instrumentation.openai_v2:OpenAIInstrumentor"
@@ -48,10 +46,7 @@ Repository = "https://github.com/open-telemetry/opentelemetry-python-contrib"
 path = "src/opentelemetry/instrumentation/openai_v2/version.py"
 
 [tool.hatch.build.targets.sdist]
-include = [
-  "/src",
-  "/tests",
-]
+include = ["/src", "/tests"]
 
 [tool.hatch.build.targets.wheel]
 packages = ["src/opentelemetry"]

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.37  # when updating, also update in pyproject.toml
-opentelemetry-sdk==1.37  # when updating, also update in pyproject.toml
-opentelemetry-semantic-conventions==0.58b0  # when updating, also update in pyproject.toml
+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
 
 -e instrumentation-genai/opentelemetry-instrumentation-openai-v2
 -e util/opentelemetry-util-genai

util/opentelemetry-util-genai/CHANGELOG.md

@@ -7,7 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
-- Enrich ToolCall type ([#4218](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4218))
+- Enrich ToolCall type, breaking change: usage of ToolCall class renamed to ToolCallRequest 
+  ([#4218](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4218))
+- Add EmbeddingInvocation span lifecycle support
+  ([https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4219](#4219))
 - Populate schema_url on metrics
   ([#4320](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4320))
 - Add workflow invocation type to genAI utils
@@ -42,10 +45,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3795](#3795))
 - Make inputs / outputs / system instructions optional params to `on_completion`,
   ([https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3802](#3802)).
-  - Use a SHA256 hash of the system instructions as it's upload filename, and check
+- Use a SHA256 hash of the system instructions as it's upload filename, and check
   if the file exists before re-uploading it, ([https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3814](#3814)).
 
-
 ## Version 0.1b0 (2025-09-25)
 
 - Add completion hook to genai utils to implement semconv v1.37.
@@ -58,6 +60,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#3752](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3752))
   ([#3759](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3759))
   ([#3763](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3763))
+
 - Add a utility to parse the `OTEL_INSTRUMENTATION_GENAI_CAPTURE_MESSAGE_CONTENT` environment variable.
   Add `gen_ai_latest_experimental` as a new value to the Sem Conv stability flag ([#3716](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3716)).
 

util/opentelemetry-util-genai/README.rst

@@ -36,6 +36,18 @@ This package provides these span attributes:
 - `gen_ai.output.messages`: Str('[{"role": "AI", "parts": [{"content": "hello back", "type": "text"}], "finish_reason": "stop"}]')
 - `gen_ai.system_instructions`: Str('[{"content": "You are a helpful assistant.", "type": "text"}]') (when system instruction is provided)
 
+This package also supports embedding invocation spans via the `embedding` context manager.
+For embedding invocations, common attributes include:
+
+- `gen_ai.provider.name`: Str(openai)
+- `gen_ai.operation.name`: Str(embeddings)
+- `gen_ai.request.model`: Str(text-embedding-3-small)
+- `gen_ai.embeddings.dimension.count`: Int(1536)
+- `gen_ai.request.encoding_formats`: Slice(["float"])
+- `gen_ai.usage.input_tokens`: Int(24)
+- `server.address`: Str(api.openai.com)
+- `server.port`: Int(443)
+
 When `EVENT_ONLY` or `SPAN_AND_EVENT` mode is enabled and a LoggerProvider is configured, 
 the package also emits `gen_ai.client.inference.operation.details` events with structured 
 message content (as dictionaries instead of JSON strings). Note that when using `EVENT_ONLY` 

util/opentelemetry-util-genai/pyproject.toml

@@ -26,9 +26,9 @@ classifiers = [
   "Programming Language :: Python :: 3.14",
 ]
 dependencies = [
-  "opentelemetry-instrumentation ~= 0.58b0",
-  "opentelemetry-semantic-conventions ~= 0.58b0",
-  "opentelemetry-api>=1.31.0",
+  "opentelemetry-instrumentation ~= 0.60b0",
+  "opentelemetry-semantic-conventions ~= 0.60b0",
+  "opentelemetry-api>=1.39",
 ]
 
 [project.entry-points.opentelemetry_genai_completion_hook]
@@ -46,10 +46,7 @@ Repository = "https://github.com/open-telemetry/opentelemetry-python-contrib"
 path = "src/opentelemetry/util/genai/version.py"
 
 [tool.hatch.build.targets.sdist]
-include = [
-  "/src",
-  "/tests",
-]
+include = ["/src", "/tests"]
 
 [tool.hatch.build.targets.wheel]
 packages = ["src/opentelemetry"]