Merge branch 'main' into anthropic-async

Author: vasantteja

.pre-commit-config.yaml

@@ -10,9 +10,10 @@ repos:
       - id: ruff-format
   - repo: https://github.com/astral-sh/uv-pre-commit
     # uv version.
-    rev: 0.6.0
+    rev: 1ce7e7fa8aa6eda60e54755509a9380b0f1c5d08 # frozen: v0.9.30
     hooks:
       - id: uv-lock
+        args: ["--index-url", "https://pypi.org/simple/"]
   - repo: https://github.com/rstcheck/rstcheck
     rev: 77490ffa33bfc0928975ae3cf904219903db755d # frozen: v6.2.5
     hooks:

CHANGELOG.md

@@ -104,6 +104,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#3922](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3922))
 - `opentelemetry-instrumentation-urllib3`: fix multiple arguments error
   ([#4144](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4144))
+- `opentelemetry-instrumentation-psycopg`: Fix instrument of typed psycopg sql
+  ([#4078](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4171))
 - `opentelemetry-instrumentation-aiohttp-server`: fix HTTP error inconsistencies
   ([#4175](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4175))
 
@@ -112,7 +114,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `opentelemetry-instrumentation-logging`: Inject span context attributes into logging LogRecord only if configured to do so
   ([#4112](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4112))
 - `opentelemetry-instrumentation-django`: Drop support for Django < 2.0
-  ([#3848](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4083))
+  ([#4083](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4083))
 
 ## Version 1.39.0/0.60b0 (2025-12-03)
 

README.md

@@ -126,6 +126,7 @@ For more information about the maintainer role, see the [community repository](h
 - [Héctor Hernández](https://github.com/hectorhdzg), Microsoft
 - [Jeremy Voss](https://github.com/jeremydvoss), Microsoft
 - [Liudmila Molkova](https://github.com/lmolkova), Grafana Labs
+- [Lukas Hering](https://github.com/herin049), Capital One
 - [Owais Lone](https://github.com/owais), Splunk
 - [Pablo Collins](https://github.com/pmcollins), Splunk
 - [Sanket Mehta](https://github.com/sanketmehta28), Cisco

docs-requirements.txt

@@ -2,6 +2,9 @@ sphinx==7.1.2
 sphinx-rtd-theme==2.0.0rc4
 sphinx-autodoc-typehints==1.25.2
 
+# Required to avoid breakages for pyramid and cassandra packages
+setuptools<82.0.0
+
 # Required by opentelemetry-instrumentation
 fastapi>=0.65.2
 pymemcache~=1.3

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 `StreamWrapper` missing `.headers` and other attributes when using `with_raw_response` streaming
+  ([#4113](https://github.com/open-telemetry/opentelemetry-python-contrib/issues/4113))
+
 ## Version 2.3b0 (2025-12-24)
 
 - Fix `AttributeError` when handling `LegacyAPIResponse` (from `with_raw_response`)

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

@@ -702,6 +702,9 @@ def process_chunk(self, chunk):
         self.build_streaming_response(chunk)
         self.set_usage(chunk)
 
+    def __getattr__(self, name):
+        return getattr(self.stream, name)
+
     def parse(self):
         """Called when using with_raw_response with stream=True"""
         return self

instrumentation-genai/opentelemetry-instrumentation-openai-v2/tests/requirements.oldest.txt

@@ -15,7 +15,9 @@
 # This variant of the requirements aims to test the system using
 # the oldest supported version of external dependencies.
 
-openai[datalib]==1.26.0
+openai==1.26.0
+numpy==2.1.0 ; python_version >= "3.10"
+numpy==2.0.0 ; python_version == "3.9"
 pydantic==2.8.2
 httpx==0.27.2
 Deprecated==1.2.14

instrumentation/opentelemetry-instrumentation-aiohttp-client/tests/test_aiohttp_client_integration.py

@@ -91,6 +91,9 @@ async def do_request():
     return loop.run_until_complete(do_request())
 
 
+SCOPE = "opentelemetry.instrumentation.aiohttp_client"
+
+
 # pylint: disable=too-many-public-methods
 class TestAioHttpIntegration(TestBase):
     _test_status_codes = (
@@ -122,7 +125,7 @@ def _assert_spans(self, spans, num_spans=1):
         )
 
     def _assert_metrics(self, num_metrics: int = 1):
-        metrics = self.get_sorted_metrics()
+        metrics = self.get_sorted_metrics(SCOPE)
         self.assertEqual(len(metrics), num_metrics)
         return metrics
 
@@ -1312,7 +1315,7 @@ def _assert_spans(self, num_spans: int):
         return finished_spans
 
     def _assert_metrics(self, num_metrics: int = 1):
-        metrics = self.get_sorted_metrics()
+        metrics = self.get_sorted_metrics(SCOPE)
         self.assertEqual(len(metrics), num_metrics)
         return metrics
 

instrumentation/opentelemetry-instrumentation-flask/tests/test_flask_compatibility.py

@@ -302,10 +302,12 @@ def generate():
         "Flask 3.1+ streaming context cleanup only enabled on Python 3.10+",
     )
     @skipIf(
-        lambda: not __import__(
-            "opentelemetry.instrumentation.flask",
-            fromlist=["_IS_FLASK_31_PLUS"],
-        )._IS_FLASK_31_PLUS,
+        lambda: (
+            not __import__(
+                "opentelemetry.instrumentation.flask",
+                fromlist=["_IS_FLASK_31_PLUS"],
+            )._IS_FLASK_31_PLUS
+        ),
         "Flask 3.1+ streaming context cleanup requires Flask 3.1+",
     )
     def test_flask_31_streaming_context_cleanup(self):

instrumentation/opentelemetry-instrumentation-httpx/tests/test_httpx_integration.py

@@ -142,6 +142,8 @@ async def _async_no_update_request_hook(span: "Span", request: "RequestInfo"):
 
 # pylint: disable=too-many-public-methods
 
+SCOPE = "opentelemetry.instrumentation.httpx"
+
 
 # Using this wrapper class to have a base class for the tests while also not
 # angering pylint or mypy when calling methods not in the class when only
@@ -205,7 +207,7 @@ def assert_span(
             return span_list
 
         def assert_metrics(self, num_metrics: int = 1):
-            metrics = self.get_sorted_metrics()
+            metrics = self.get_sorted_metrics(SCOPE)
             self.assertEqual(len(metrics), num_metrics)
             return metrics
 
@@ -244,7 +246,7 @@ def test_basic(self):
 
         def test_basic_metrics(self):
             self.perform_request(self.URL)
-            metrics = self.get_sorted_metrics()
+            metrics = self.get_sorted_metrics(SCOPE)
             self.assertEqual(len(metrics), 1)
             duration_data_point = metrics[0].data.data_points[0]
             self.assertEqual(duration_data_point.count, 1)
@@ -289,7 +291,7 @@ def test_nonstandard_http_method(self):
                 span, opentelemetry.instrumentation.httpx
             )
             # Validate metrics
-            metrics = self.get_sorted_metrics()
+            metrics = self.get_sorted_metrics(SCOPE)
             self.assertEqual(len(metrics), 1)
             duration_data_point = metrics[0].data.data_points[0]
             self.assertEqual(duration_data_point.count, 1)
@@ -331,7 +333,7 @@ def test_nonstandard_http_method_new_semconv(self):
                 span, opentelemetry.instrumentation.httpx
             )
             # Validate metrics
-            metrics = self.get_sorted_metrics()
+            metrics = self.get_sorted_metrics(SCOPE)
             self.assertEqual(len(metrics), 1)
             duration_data_point = metrics[0].data.data_points[0]
             self.assertEqual(duration_data_point.count, 1)
@@ -391,7 +393,7 @@ def test_basic_new_semconv(self):
             )
 
             # Validate metrics
-            metrics = self.get_sorted_metrics()
+            metrics = self.get_sorted_metrics(SCOPE)
             self.assertEqual(len(metrics), 1)
             duration_data_point = metrics[0].data.data_points[0]
             self.assertEqual(duration_data_point.count, 1)
@@ -448,7 +450,7 @@ def test_basic_both_semconv(self):
             )
 
             # Validate metrics
-            metrics = self.get_sorted_metrics()
+            metrics = self.get_sorted_metrics(SCOPE)
             self.assertEqual(len(metrics), 2)
             # Old convention
             self.assertEqual(
@@ -497,7 +499,7 @@ def test_not_foundbasic(self):
                 trace.StatusCode.ERROR,
             )
             # Validate metrics
-            metrics = self.get_sorted_metrics()
+            metrics = self.get_sorted_metrics(SCOPE)
             self.assertEqual(len(metrics), 1)
             duration_data_point = metrics[0].data.data_points[0]
             self.assertEqual(
@@ -525,7 +527,7 @@ def test_not_foundbasic_new_semconv(self):
                 trace.StatusCode.ERROR,
             )
             # Validate metrics
-            metrics = self.get_sorted_metrics()
+            metrics = self.get_sorted_metrics(SCOPE)
             self.assertEqual(len(metrics), 1)
             duration_data_point = metrics[0].data.data_points[0]
             self.assertEqual(
@@ -556,7 +558,7 @@ def test_not_foundbasic_both_semconv(self):
                 trace.StatusCode.ERROR,
             )
             # Validate metrics
-            metrics = self.get_sorted_metrics()
+            metrics = self.get_sorted_metrics(SCOPE)
             self.assertEqual(len(metrics), 2)
             # Old convention
             self.assertEqual(