Merge remote-tracking branch 'origin/main' into fix/remove-suppress-language-model-key

Co-authored-by: Cursor <cursoragent@cursor.com>

Author: adityamehra

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

@@ -7,12 +7,26 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+### Fixed
+
+- Fix `AttributeError: 'StreamWrapper' object has no attribute 'headers'` when
+  using `with_raw_response.create(stream=True)` (e.g. via LiteLLM's Azure provider).
+  `_parse_response` was calling `.parse()` on the `LegacyAPIResponse` before wrapping
+  in `StreamWrapper`, discarding the raw HTTP headers. `StreamWrapper` now captures
+  headers from the `LegacyAPIResponse` before it is parsed and exposes them directly,
+  and adds a `parse()` method returning `self` so callers can treat the wrapper as
+  a drop-in for the raw response. Also adds `__getattr__` to proxy any other unknown
+  attributes to the underlying stream. Inspired by upstream fix
+  ([opentelemetry-python-contrib#4184](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4184),
+  fixes [#4113](https://github.com/open-telemetry/opentelemetry-python-contrib/issues/4113)).
+
 ### Added
 - **`SUPPRESS_LANGUAGE_MODEL_INSTRUMENTATION` env var** — Global alternative to
-  the per-request `suppress_language_model_instrumentation` OTel context key.
-  When set to a truthy value (`true`, `1`, `yes`, `on`), the openai-v2
-  instrumentor skips creating spans entirely. Intended for zero-code deployments
-  alongside `OTEL_PYTHON_DISABLED_INSTRUMENTATIONS=openai`.
+  the per-request `suppress_language_model_instrumentation` OTel context key
+  (the env var is the uppercase form of the same string). When set to a truthy
+  value (`true`, `1`, `yes`, `on`), the openai-v2 instrumentor skips creating
+  spans entirely. Intended for zero-code deployments alongside
+  `OTEL_PYTHON_DISABLED_INSTRUMENTATIONS=openai`.
 
 ### Fixed
 

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

@@ -30,7 +30,6 @@
 )
 from opentelemetry.trace import Span
 from opentelemetry.util.genai.attributes import (
-    SUPPRESS_LANGUAGE_MODEL_INSTRUMENTATION_ENV_VAR,
     SUPPRESS_LANGUAGE_MODEL_INSTRUMENTATION_KEY,
 )
 from opentelemetry.util.genai.handler import (
@@ -74,7 +73,9 @@ def _is_instrumentation_suppressed() -> bool:
     """
     if context_api.get_value(SUPPRESS_LANGUAGE_MODEL_INSTRUMENTATION_KEY):
         return True
-    raw = os.environ.get(SUPPRESS_LANGUAGE_MODEL_INSTRUMENTATION_ENV_VAR, "")
+    raw = os.environ.get(
+        SUPPRESS_LANGUAGE_MODEL_INSTRUMENTATION_KEY.upper(), ""
+    )
     return raw.strip().lower() in ("true", "1", "yes", "on")
 
 

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

@@ -27,10 +27,14 @@
 
 from opentelemetry import context as context_api
 from opentelemetry.util.genai.attributes import (
-    SUPPRESS_LANGUAGE_MODEL_INSTRUMENTATION_ENV_VAR,
     SUPPRESS_LANGUAGE_MODEL_INSTRUMENTATION_KEY,
 )
 
+# The env var name is the uppercase form of the context key string.
+SUPPRESS_LANGUAGE_MODEL_INSTRUMENTATION_ENV_VAR = (
+    SUPPRESS_LANGUAGE_MODEL_INSTRUMENTATION_KEY.upper()
+)
+
 
 @pytest.mark.vcr()
 def test_chat_completion_suppressed(

util/opentelemetry-util-genai/CHANGELOG.md

@@ -6,12 +6,11 @@ All notable changes to this repository are documented in this file.
 
 ### Added
 
-- **`SUPPRESS_LANGUAGE_MODEL_INSTRUMENTATION` env var constant** — Added
-  `SUPPRESS_LANGUAGE_MODEL_INSTRUMENTATION_ENV_VAR` to `attributes.py` as the
-  environment variable counterpart of the existing
-  `SUPPRESS_LANGUAGE_MODEL_INSTRUMENTATION_KEY` context key. Allows
-  zero-code deployments to set suppression globally without requiring the
-  LangChain instrumentor to inject the context key per-request.
+- **`SUPPRESS_LANGUAGE_MODEL_INSTRUMENTATION` env var** — The uppercase form of
+  `SUPPRESS_LANGUAGE_MODEL_INSTRUMENTATION_KEY` is now also checked as an
+  environment variable by the openai-v2 instrumentor, allowing zero-code
+  deployments to set suppression globally without the LangChain instrumentor
+  injecting the context key per-request. No new constant added.
 
 - **`OTEL_INSTRUMENTATION_GENAI_EMIT_EVENT` env var** — Explicit override for content event emission (`true`/`false`). When unset, defaults are derived from `OTEL_INSTRUMENTATION_GENAI_CAPTURE_MESSAGE_CONTENT` mode.
 

util/opentelemetry-util-genai/src/opentelemetry/util/genai/attributes.py

@@ -96,18 +96,10 @@
 
 # Context key for suppressing instrumentation to avoid duplicate telemetry
 # when multiple instrumentations (e.g., LangChain + OpenAI) are active.
-# Can be set at runtime via context (per-request) or globally via the
-# SUPPRESS_LANGUAGE_MODEL_INSTRUMENTATION environment variable.
+# The uppercase form of this string is also checked as an environment variable
+# (SUPPRESS_LANGUAGE_MODEL_INSTRUMENTATION) so zero-code deployments can set
+# suppression globally without the LangChain instrumentor injecting it
+# per-request. Use together with OTEL_PYTHON_DISABLED_INSTRUMENTATIONS=openai.
 SUPPRESS_LANGUAGE_MODEL_INSTRUMENTATION_KEY = (
     "suppress_language_model_instrumentation"
 )
-
-# Environment variable name that mirrors the context key above.
-# When set to a truthy value ("true", "1", "yes", "on") the openai-v2
-# instrumentor skips creating spans globally — without requiring the
-# LangChain instrumentor to inject the context key per-request.
-# Intended for zero-code deployments together with
-# OTEL_PYTHON_DISABLED_INSTRUMENTATIONS=openai.
-SUPPRESS_LANGUAGE_MODEL_INSTRUMENTATION_ENV_VAR = (
-    "SUPPRESS_LANGUAGE_MODEL_INSTRUMENTATION"
-)