Merge branch 'main' into bump-pluggy

Author: lzchen

.github/workflows/stale.yml

@@ -33,3 +33,5 @@ jobs:
             This PR has been closed due to inactivity. Please reopen if you would
             like to continue working on it.
           exempt-pr-labels: "hold,WIP,blocked-by-spec,do not merge"
+          # TODO: Revert back to default of 30 after we have cleared the backlog of stale PRs.
+          operations-per-run: 500

CHANGELOG.md

@@ -11,6 +11,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+### Added
+
+- `opentelemetry-instrumentation-confluent-kafka`: Loosen confluent-kafka upper bound to <3.0.0
+  ([#4289](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4289))
+
 ### Fixed
 
 - Fix intermittent `Core Contrib Test` CI failures caused by GitHub git CDN SHA propagation lag by installing core packages from the already-checked-out local copy instead of a second git clone

docs-requirements.txt

@@ -27,7 +27,7 @@ botocore~=1.0
 boto3~=1.0
 cassandra-driver~=3.25
 celery>=4.0
-confluent-kafka>= 1.8.2,<= 2.13.0
+confluent-kafka>= 1.8.2,< 3.0.0
 elasticsearch>=6.0,<9.0
 flask~=2.0
 falcon~=2.0

instrumentation-genai/opentelemetry-instrumentation-anthropic/CHANGELOG.md

@@ -9,6 +9,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+- Add sync streaming support for `Messages.create(stream=True)` and `Messages.stream()`
+  ([#4155](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4155))
+  - `StreamWrapper` for handling `Messages.create(stream=True)` telemetry
+  - `MessageStreamManagerWrapper` for handling `Messages.stream()` telemetry
+  - `MessageWrapper` for non-streaming response telemetry extraction
 - Initial implementation of Anthropic instrumentation
   ([#3978](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3978))
 - Implement sync `Messages.create` instrumentation with GenAI semantic convention attributes

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

@@ -34,7 +34,7 @@ dependencies = [
 
 [project.optional-dependencies]
 instruments = [
-  "anthropic >= 0.16.0",
+  "anthropic >= 0.51.0",
 ]
 
 [project.entry-points.opentelemetry_instrumentor]

instrumentation-genai/opentelemetry-instrumentation-anthropic/src/opentelemetry/instrumentation/anthropic/__init__.py

@@ -54,7 +54,9 @@
 )
 
 from opentelemetry.instrumentation.anthropic.package import _instruments
-from opentelemetry.instrumentation.anthropic.patch import messages_create
+from opentelemetry.instrumentation.anthropic.patch import (
+    messages_create,
+)
 from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
 from opentelemetry.instrumentation.utils import unwrap
 from opentelemetry.util.genai.handler import TelemetryHandler
@@ -89,11 +91,12 @@ def _instrument(self, **kwargs: Any) -> None:
         # Get providers from kwargs
         tracer_provider = kwargs.get("tracer_provider")
         meter_provider = kwargs.get("meter_provider")
+        logger_provider = kwargs.get("logger_provider")
 
-        # TODO: Add logger_provider to TelemetryHandler to capture content events.
         handler = TelemetryHandler(
             tracer_provider=tracer_provider,
             meter_provider=meter_provider,
+            logger_provider=logger_provider,
         )
 
         # Patch Messages.create

instrumentation-genai/opentelemetry-instrumentation-anthropic/src/opentelemetry/instrumentation/anthropic/messages_extractors.py

@@ -0,0 +1,219 @@
+# Copyright The OpenTelemetry Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Get/extract helpers for Anthropic Messages instrumentation."""
+
+from __future__ import annotations
+
+from dataclasses import dataclass
+from typing import TYPE_CHECKING, Sequence
+
+from anthropic.types import MessageDeltaUsage
+
+from opentelemetry.semconv._incubating.attributes import (
+    gen_ai_attributes as GenAIAttributes,
+)
+from opentelemetry.semconv._incubating.attributes import (
+    server_attributes as ServerAttributes,
+)
+from opentelemetry.util.genai.types import (
+    InputMessage,
+    MessagePart,
+    OutputMessage,
+)
+from opentelemetry.util.types import AttributeValue
+
+from .utils import (
+    convert_content_to_parts,
+    normalize_finish_reason,
+)
+
+if TYPE_CHECKING:
+    from collections.abc import Iterable, Mapping
+
+    import httpx
+    from anthropic.resources.messages import Messages
+    from anthropic.types import (
+        Message,
+        MessageParam,
+        MetadataParam,
+        TextBlockParam,
+        ThinkingConfigParam,
+        ToolChoiceParam,
+        ToolUnionParam,
+        Usage,
+    )
+
+
+@dataclass
+class MessageRequestParams:
+    model: str | None = None
+    max_tokens: int | None = None
+    temperature: float | None = None
+    top_k: int | None = None
+    top_p: float | None = None
+    stop_sequences: Sequence[str] | None = None
+    stream: bool | None = None
+    messages: Iterable[MessageParam] | None = None
+    system: str | Iterable[TextBlockParam] | None = None
+
+
+GEN_AI_USAGE_CACHE_CREATION_INPUT_TOKENS = (
+    "gen_ai.usage.cache_creation.input_tokens"
+)
+GEN_AI_USAGE_CACHE_READ_INPUT_TOKENS = "gen_ai.usage.cache_read.input_tokens"
+
+
+@dataclass
+class UsageTokens:
+    input_tokens: int | None = None
+    output_tokens: int | None = None
+    cache_creation_input_tokens: int | None = None
+    cache_read_input_tokens: int | None = None
+
+
+def extract_usage_tokens(
+    usage: Usage | MessageDeltaUsage | None,
+) -> UsageTokens:
+    if usage is None:
+        return UsageTokens()
+
+    input_tokens = usage.input_tokens
+    output_tokens = usage.output_tokens
+    cache_creation_input_tokens = usage.cache_creation_input_tokens
+    cache_read_input_tokens = usage.cache_read_input_tokens
+
+    if (
+        input_tokens is None
+        and cache_creation_input_tokens is None
+        and cache_read_input_tokens is None
+    ):
+        total_input_tokens = None
+    else:
+        total_input_tokens = (
+            (input_tokens or 0)
+            + (cache_creation_input_tokens or 0)
+            + (cache_read_input_tokens or 0)
+        )
+
+    return UsageTokens(
+        input_tokens=total_input_tokens,
+        output_tokens=output_tokens,
+        cache_creation_input_tokens=cache_creation_input_tokens,
+        cache_read_input_tokens=cache_read_input_tokens,
+    )
+
+
+def get_input_messages(
+    messages: Iterable[MessageParam] | None,
+) -> list[InputMessage]:
+    if messages is None:
+        return []
+    result: list[InputMessage] = []
+    for message in messages:
+        role = message["role"]
+        parts = convert_content_to_parts(message["content"])
+        result.append(InputMessage(role=role, parts=parts))
+    return result
+
+
+def get_system_instruction(
+    system: str | Iterable[TextBlockParam] | None,
+) -> list[MessagePart]:
+    if system is None:
+        return []
+    return convert_content_to_parts(system)
+
+
+def get_output_messages_from_message(
+    message: Message | None,
+) -> list[OutputMessage]:
+    if message is None:
+        return []
+
+    parts = convert_content_to_parts(message.content)
+    finish_reason = normalize_finish_reason(message.stop_reason)
+    return [
+        OutputMessage(
+            role=message.role,
+            parts=parts,
+            finish_reason=finish_reason or "",
+        )
+    ]
+
+
+def extract_params(  # pylint: disable=too-many-locals
+    *,
+    max_tokens: int | None = None,
+    messages: Iterable[MessageParam] | None = None,
+    model: str | None = None,
+    metadata: MetadataParam | None = None,
+    service_tier: str | None = None,
+    stop_sequences: Sequence[str] | None = None,
+    stream: bool | None = None,
+    system: str | Iterable[TextBlockParam] | None = None,
+    temperature: float | None = None,
+    thinking: ThinkingConfigParam | None = None,
+    tool_choice: ToolChoiceParam | None = None,
+    tools: Iterable[ToolUnionParam] | None = None,
+    top_k: int | None = None,
+    top_p: float | None = None,
+    extra_headers: Mapping[str, str] | None = None,
+    extra_query: Mapping[str, object] | None = None,
+    extra_body: object | None = None,
+    timeout: float | httpx.Timeout | None = None,
+    **_kwargs: object,
+) -> MessageRequestParams:
+    return MessageRequestParams(
+        model=model,
+        max_tokens=max_tokens,
+        temperature=temperature,
+        top_p=top_p,
+        top_k=top_k,
+        stop_sequences=stop_sequences,
+        stream=stream,
+        messages=messages,
+        system=system,
+    )
+
+
+def _set_server_address_and_port(
+    client_instance: "Messages",
+    attributes: dict[str, AttributeValue | None],
+) -> None:
+    base_url = client_instance._client.base_url
+    host = base_url.host
+    if host:
+        attributes[ServerAttributes.SERVER_ADDRESS] = host
+
+    port = base_url.port
+    if port and port != 443 and port > 0:
+        attributes[ServerAttributes.SERVER_PORT] = port
+
+
+def get_llm_request_attributes(
+    params: MessageRequestParams, client_instance: "Messages"
+) -> dict[str, AttributeValue]:
+    attributes: dict[str, AttributeValue | None] = {
+        GenAIAttributes.GEN_AI_OPERATION_NAME: GenAIAttributes.GenAiOperationNameValues.CHAT.value,
+        GenAIAttributes.GEN_AI_SYSTEM: GenAIAttributes.GenAiSystemValues.ANTHROPIC.value,  # pyright: ignore[reportDeprecated]
+        GenAIAttributes.GEN_AI_REQUEST_MODEL: params.model,
+        GenAIAttributes.GEN_AI_REQUEST_MAX_TOKENS: params.max_tokens,
+        GenAIAttributes.GEN_AI_REQUEST_TEMPERATURE: params.temperature,
+        GenAIAttributes.GEN_AI_REQUEST_TOP_P: params.top_p,
+        GenAIAttributes.GEN_AI_REQUEST_TOP_K: params.top_k,
+        GenAIAttributes.GEN_AI_REQUEST_STOP_SEQUENCES: params.stop_sequences,
+    }
+    _set_server_address_and_port(client_instance, attributes)
+    return {k: v for k, v in attributes.items() if v is not None}