Merge branch 'main' into openai-not-given

Author: xrmx

CHANGELOG.md

@@ -11,6 +11,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+- `opentelemetry-instrumentation-requests`, `opentelemetry-instrumentation-wsgi`, `opentelemetry-instrumentation-asgi` Detect synthetic sources on requests, ASGI, and WSGI.
+  ([#3674](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3674))
+
 ### Added 
 
 - `opentelemetry-instrumentation-aiohttp-client`: add support for url exclusions via `OTEL_PYTHON_EXCLUDED_URLS` / `OTEL_PYTHON_AIOHTTP_CLIENT_EXCLUDED_URLS`
@@ -27,6 +30,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#3884](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3884))
 - `opentelemetry-instrumentation-aiohttp-server`: add support for custom header captures via `OTEL_INSTRUMENTATION_HTTP_CAPTURE_HEADERS_SERVER_REQUEST` and `OTEL_INSTRUMENTATION_HTTP_CAPTURE_HEADERS_SERVER_RESPONSE`
   ([#3916](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3916))
+- `opentelemetry-instrumentation-redis`: add support for `suppress_instrumentation` context manager for both sync and async Redis clients and pipelines
+- `opentelemetry-instrumentation-django`: improve docs for response_hook with examples of providing attributes from middlewares
+  ([#3923](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3923))
+- Update for Log SDK breaking changes. Rename InMemoryLogExporter to InMemoryLogRecordExporter in several tests
+  ([#3850](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3589))
 
 ### Fixed
 
@@ -50,8 +58,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#3904](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3904))
 - build: bump ruff to 0.14.1
   ([#3842](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3842))
+- `opentelemetry-instrumentation-redis`: Add default span name for pipeline operations
+  ([#3941](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3941))
 - `opentelemetry-instrumentation-pymongo`: Fix invalid mongodb collection attribute type
   ([#3942](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3942))
+- `opentelemetry-instrumentation-aiohttp-client`: Fix metric attribute leakage 
+  ([#3936](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3936))
+- `opentelemetry-instrumentation-aiohttp-client`: Update instrumentor to respect suppressing http instrumentation
+  ([#3957](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3957))
 
 ## Version 1.38.0/0.59b0 (2025-10-16)
 
@@ -65,6 +79,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#3796](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3796))
 - `opentelemetry-instrumentation-fastapi`: Fix handling of APIRoute subclasses
   ([#3681](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3681))
+- `opentelemetry-instrumentation-flask`: Fix exemplars generation for `http.server.request.duration` and `http.server.duration` metrics
+  ([#3912](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3912))
 
 ### Added
 

README.md

@@ -124,6 +124,7 @@ For more information about the maintainer role, see the [community repository](h
 - [Dylan Russell](https://github.com/dylanrussell), Google
 - [Emídio Neto](https://github.com/emdneto), PicPay
 - [Jeremy Voss](https://github.com/jeremydvoss), Microsoft
+- [Liudmila Molkova](https://github.com/lmolkova), Grafana Labs
 - [Owais Lone](https://github.com/owais), Splunk
 - [Pablo Collins](https://github.com/pmcollins), Splunk
 - [Sanket Mehta](https://github.com/sanketmehta28), Cisco

instrumentation-genai/opentelemetry-instrumentation-google-genai/tests/common/otel_mocker.py

@@ -22,10 +22,21 @@
 )
 from opentelemetry.metrics import get_meter_provider, set_meter_provider
 from opentelemetry.sdk._logs import LoggerProvider
-from opentelemetry.sdk._logs.export import (
-    InMemoryLogExporter,
-    SimpleLogRecordProcessor,
-)
+
+# Backward compatibility for InMemoryLogExporter -> InMemoryLogRecordExporter rename
+try:
+    from opentelemetry.sdk._logs.export import (  # pylint: disable=no-name-in-module
+        InMemoryLogRecordExporter,
+        SimpleLogRecordProcessor,
+    )
+except ImportError:
+    # Fallback to old name for compatibility with older SDK versions
+    from opentelemetry.sdk._logs.export import (
+        InMemoryLogExporter as InMemoryLogRecordExporter,
+    )
+    from opentelemetry.sdk._logs.export import (
+        SimpleLogRecordProcessor,
+    )
 from opentelemetry.sdk.metrics import MeterProvider
 from opentelemetry.sdk.metrics._internal.export import InMemoryMetricReader
 from opentelemetry.sdk.trace import TracerProvider
@@ -114,7 +125,7 @@ def data(self):
 class OTelMocker:
     def __init__(self):
         self._snapshot = None
-        self._logs = InMemoryLogExporter()
+        self._logs = InMemoryLogRecordExporter()
         self._traces = InMemorySpanExporter()
         self._metrics = InMemoryMetricReader()
         self._spans = []

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

@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+- Fix service tier attribute names: use `GEN_AI_OPENAI_REQUEST_SERVICE_TIER` for request
+  attributes and `GEN_AI_OPENAI_RESPONSE_SERVICE_TIER` for response attributes.
+  ([#3920](https://github.com/open-telemetry/opentelemetry-python-contrib/issues/3920))
 - Added support for OpenAI embeddings instrumentation
   ([#3461](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3461))
 - Record prompt and completion events regardless of span sampling decision.

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

@@ -370,7 +370,7 @@ def _set_response_attributes(
     if getattr(result, "service_tier", None):
         set_span_attribute(
             span,
-            GenAIAttributes.GEN_AI_OPENAI_REQUEST_SERVICE_TIER,
+            GenAIAttributes.GEN_AI_OPENAI_RESPONSE_SERVICE_TIER,
             result.service_tier,
         )
 

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

@@ -236,8 +236,13 @@ def get_llm_request_attributes(
                     GenAIAttributes.GEN_AI_OPENAI_REQUEST_RESPONSE_FORMAT
                 ] = response_format
 
+        # service_tier can be passed directly or in extra_body (in SDK 1.26.0 it's via extra_body)
         service_tier = kwargs.get("service_tier")
-        attributes[GenAIAttributes.GEN_AI_OPENAI_RESPONSE_SERVICE_TIER] = (
+        if service_tier is None:
+            extra_body = kwargs.get("extra_body")
+            if isinstance(extra_body, Mapping):
+                service_tier = extra_body.get("service_tier")
+        attributes[GenAIAttributes.GEN_AI_OPENAI_REQUEST_SERVICE_TIER] = (
             service_tier if service_tier != "auto" else None
         )
 

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

@@ -12,10 +12,21 @@
     OTEL_INSTRUMENTATION_GENAI_CAPTURE_MESSAGE_CONTENT,
 )
 from opentelemetry.sdk._logs import LoggerProvider
-from opentelemetry.sdk._logs.export import (
-    InMemoryLogExporter,
-    SimpleLogRecordProcessor,
-)
+
+# Backward compatibility for InMemoryLogExporter -> InMemoryLogRecordExporter rename
+try:
+    from opentelemetry.sdk._logs.export import (  # pylint: disable=no-name-in-module
+        InMemoryLogRecordExporter,
+        SimpleLogRecordProcessor,
+    )
+except ImportError:
+    # Fallback to old name for compatibility with older SDK versions
+    from opentelemetry.sdk._logs.export import (
+        InMemoryLogExporter as InMemoryLogRecordExporter,
+    )
+    from opentelemetry.sdk._logs.export import (
+        SimpleLogRecordProcessor,
+    )
 from opentelemetry.sdk.metrics import (
     MeterProvider,
 )
@@ -38,7 +49,7 @@ def fixture_span_exporter():
 
 @pytest.fixture(scope="function", name="log_exporter")
 def fixture_log_exporter():
-    exporter = InMemoryLogExporter()
+    exporter = InMemoryLogRecordExporter()
     yield exporter
 
 

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

@@ -183,6 +183,8 @@ async def test_async_chat_completion_extra_params(
         response.model,
         response.usage.prompt_tokens,
         response.usage.completion_tokens,
+        request_service_tier="default",
+        response_service_tier=getattr(response, "service_tier", None),
     )
     assert (
         spans[0].attributes[GenAIAttributes.GEN_AI_OPENAI_REQUEST_SEED] == 42

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

@@ -269,6 +269,8 @@ def test_chat_completion_extra_params(
         response.model,
         response.usage.prompt_tokens,
         response.usage.completion_tokens,
+        request_service_tier="default",
+        response_service_tier=getattr(response, "service_tier", None),
     )
     assert (
         spans[0].attributes[GenAIAttributes.GEN_AI_OPENAI_REQUEST_SEED] == 42

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

@@ -25,6 +25,14 @@
 )
 
 
+def _assert_optional_attribute(span, attribute_name, expected_value):
+    """Helper to assert optional span attributes."""
+    if expected_value is not None:
+        assert expected_value == span.attributes[attribute_name]
+    else:
+        assert attribute_name not in span.attributes
+
+
 def assert_all_attributes(
     span: ReadableSpan,
     request_model: str,
@@ -35,6 +43,8 @@ def assert_all_attributes(
     operation_name: str = "chat",
     server_address: str = "api.openai.com",
     server_port: int = 443,
+    request_service_tier: Optional[str] = None,
+    response_service_tier: Optional[str] = None,
 ):
     assert span.name == f"{operation_name} {request_model}"
     assert (
@@ -49,44 +59,35 @@ def assert_all_attributes(
         request_model == span.attributes[GenAIAttributes.GEN_AI_REQUEST_MODEL]
     )
 
-    if response_model:
-        assert (
-            response_model
-            == span.attributes[GenAIAttributes.GEN_AI_RESPONSE_MODEL]
-        )
-    else:
-        assert GenAIAttributes.GEN_AI_RESPONSE_MODEL not in span.attributes
-
-    if response_id:
-        assert (
-            response_id == span.attributes[GenAIAttributes.GEN_AI_RESPONSE_ID]
-        )
-    else:
-        assert GenAIAttributes.GEN_AI_RESPONSE_ID not in span.attributes
-
-    if input_tokens:
-        assert (
-            input_tokens
-            == span.attributes[GenAIAttributes.GEN_AI_USAGE_INPUT_TOKENS]
-        )
-    else:
-        assert GenAIAttributes.GEN_AI_USAGE_INPUT_TOKENS not in span.attributes
-
-    if output_tokens:
-        assert (
-            output_tokens
-            == span.attributes[GenAIAttributes.GEN_AI_USAGE_OUTPUT_TOKENS]
-        )
-    else:
-        assert (
-            GenAIAttributes.GEN_AI_USAGE_OUTPUT_TOKENS not in span.attributes
-        )
+    _assert_optional_attribute(
+        span, GenAIAttributes.GEN_AI_RESPONSE_MODEL, response_model
+    )
+    _assert_optional_attribute(
+        span, GenAIAttributes.GEN_AI_RESPONSE_ID, response_id
+    )
+    _assert_optional_attribute(
+        span, GenAIAttributes.GEN_AI_USAGE_INPUT_TOKENS, input_tokens
+    )
+    _assert_optional_attribute(
+        span, GenAIAttributes.GEN_AI_USAGE_OUTPUT_TOKENS, output_tokens
+    )
 
     assert server_address == span.attributes[ServerAttributes.SERVER_ADDRESS]
 
     if server_port != 443 and server_port > 0:
         assert server_port == span.attributes[ServerAttributes.SERVER_PORT]
 
+    _assert_optional_attribute(
+        span,
+        GenAIAttributes.GEN_AI_OPENAI_REQUEST_SERVICE_TIER,
+        request_service_tier,
+    )
+    _assert_optional_attribute(
+        span,
+        GenAIAttributes.GEN_AI_OPENAI_RESPONSE_SERVICE_TIER,
+        response_service_tier,
+    )
+
 
 def assert_log_parent(log, span):
     """Assert that the log record has the correct parent span context"""