Merge branch 'main' into structlog-handler

Author: JWinermaSplunk

CHANGELOG.md

@@ -23,6 +23,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#4212](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4212))
 - `opentelemetry-instrumentation-botocore`: Add support for instrumenting `aiobotocore`
   ([#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))
 
 ### Fixed
 
@@ -34,6 +36,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#4305](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4305))
 - Don't import module in unwrap if not already imported
   ([#4321](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4321))
+- `opentelemetry-instrumentation-logging`: Map Python `CRITICAL` log level to OTel `FATAL` severity text and `WARNING` to `WARN`
+  ([#4365](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4365))
 - `opentelemetry-instrumentation-logging`: Add recursion guard in LoggingHandler.emit to prevent deadlock
   ([#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'`

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/src/opentelemetry/instrumentation/anthropic/utils.py

@@ -38,7 +38,7 @@
     MessagePart,
     Reasoning,
     Text,
-    ToolCall,
+    ToolCallRequest,
     ToolCallResponse,
 )
 
@@ -114,7 +114,7 @@ def _convert_dict_block_to_part(
 
     if block_type == "tool_use":
         inp = block.get("input")
-        return ToolCall(
+        return ToolCallRequest(
             arguments=inp if isinstance(inp, dict) else None,
             name=str(block.get("name", "")),
             id=str(block.get("id", "")),
@@ -144,7 +144,9 @@ def _convert_content_block_to_part(
         return Text(content=block.text)
 
     if isinstance(block, (ToolUseBlock, ServerToolUseBlock)):
-        return ToolCall(arguments=block.input, name=block.name, id=block.id)
+        return ToolCallRequest(
+            arguments=block.input, name=block.name, id=block.id
+        )
 
     if isinstance(block, (ThinkingBlock, RedactedThinkingBlock)):
         content = (
@@ -229,7 +231,7 @@ def stream_block_state_to_part(state: StreamBlockState) -> MessagePart | None:
                 arguments = json.loads(state.input_json)
             except ValueError:
                 arguments = state.input_json
-        return ToolCall(
+        return ToolCallRequest(
             arguments=arguments,
             name=state.tool_name,
             id=state.tool_id,

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-google-genai/pyproject.toml

@@ -39,10 +39,10 @@ classifiers = [
   "Programming Language :: Python :: 3.14",
 ]
 dependencies = [
-  "opentelemetry-api ~=1.37",
-  "opentelemetry-instrumentation >=0.58b0, <2",
-  "opentelemetry-semantic-conventions >=0.58b0, <2",
-  "opentelemetry-util-genai >= 0.3b0, <0.4b0",
+  "opentelemetry-api ~=1.39",
+  "opentelemetry-instrumentation >=0.60b0, <2",
+  "opentelemetry-semantic-conventions >=0.60b0, <2",
+  "opentelemetry-util-genai >= 0.4b0.dev, <0.5b0",
 ]
 
 [project.optional-dependencies]

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

@@ -15,20 +15,20 @@
 from __future__ import annotations
 
 import logging
-from dataclasses import dataclass
 from enum import Enum
-from typing import Literal
 
 from google.genai import types as genai_types
 
 from opentelemetry.util.genai.types import (
+    Blob,
     FinishReason,
     InputMessage,
     MessagePart,
     OutputMessage,
     Text,
-    ToolCall,
+    ToolCallRequest,
     ToolCallResponse,
+    Uri,
 )
 
 
@@ -39,23 +39,6 @@ class Role(str, Enum):
     TOOL = "tool"
 
 
-@dataclass
-class BlobPart:
-    data: bytes
-    mime_type: str
-    type: Literal["blob"] = "blob"
-
-
-@dataclass
-class FileDataPart:
-    mime_type: str
-    uri: str
-    type: Literal["file_data"] = "file_data"
-
-    class Config:
-        extra = "allow"
-
-
 _logger = logging.getLogger(__name__)
 
 
@@ -121,16 +104,26 @@ def tool_call_id(name: str | None) -> str:
     if (text := part.text) is not None:
         return Text(content=text)
 
-    if data := part.inline_data:
-        return BlobPart(mime_type=data.mime_type or "", data=data.data or b"")
+    if inline_data := part.inline_data:
+        mime_type = inline_data.mime_type or ""
+        modality = mime_type.split("/")[0] if mime_type else ""
+        return Blob(
+            mime_type=mime_type,
+            modality=modality,
+            content=inline_data.data or b"",
+        )
 
-    if data := part.file_data:
-        return FileDataPart(
-            mime_type=data.mime_type or "", uri=data.file_uri or ""
+    if file_data := part.file_data:
+        mime_type = file_data.mime_type or ""
+        modality = mime_type.split("/")[0] if mime_type else ""
+        return Uri(
+            mime_type=mime_type,
+            modality=modality,
+            uri=file_data.file_uri or "",
         )
 
     if call := part.function_call:
-        return ToolCall(
+        return ToolCallRequest(
             id=call.id or tool_call_id(call.name),
             name=call.name or "",
             arguments=call.args,

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

@@ -21,11 +21,11 @@ pytest-vcr==1.0.2
 
 google-auth==2.15.0
 google-genai==1.32.0
-opentelemetry-api==1.37.0
-opentelemetry-sdk==1.37.0
-opentelemetry-semantic-conventions==0.58b0
-opentelemetry-instrumentation==0.58b0
-opentelemetry-util-genai[upload]==0.3b0
+opentelemetry-api==1.39.0
+opentelemetry-sdk==1.39.0
+opentelemetry-semantic-conventions==0.60b0
+opentelemetry-instrumentation==0.60b0
+-e util/opentelemetry-util-genai[upload]
 
 fsspec==2025.9.0
 

instrumentation-genai/opentelemetry-instrumentation-langchain/src/opentelemetry/instrumentation/langchain/callback_handler.py

@@ -14,7 +14,7 @@
 
 from __future__ import annotations
 
-from typing import Any, Optional
+from typing import Any, Optional, cast
 from uuid import UUID
 
 from langchain_core.callbacks import BaseCallbackHandler
@@ -29,6 +29,7 @@
     Error,
     InputMessage,
     LLMInvocation,
+    MessagePart,
     OutputMessage,
     Text,
 )
@@ -133,7 +134,11 @@ def on_chat_model_start(
                                     Text(content=text_value, type="text")
                                 )
 
-                input_messages.append(InputMessage(parts=parts, role=role))
+                input_messages.append(
+                    InputMessage(
+                        parts=cast(list[MessagePart], parts), role=role
+                    )
+                )
 
         llm_invocation = LLMInvocation(
             request_model=request_model,
@@ -206,7 +211,7 @@ def on_llm_end(
                     role = chat_generation.message.type
                     output_message = OutputMessage(
                         role=role,
-                        parts=parts,
+                        parts=cast(list[MessagePart], parts),
                         finish_reason=finish_reason,
                     )
                     output_messages.append(output_message)