Merge remote-tracking branch 'upstream/main' into fix/GH-3642-fastapi-exceptions

Author: outergod

.github/component_owners.yml

@@ -33,12 +33,11 @@ components:
     - dorkolog
 
   propagator/opentelemetry-propagator-aws-xray:
-    - NathanielRN
+    - jj22ee
 
   sdk-extension/opentelemetry-sdk-extension-aws:
-    - NathanielRN
-    - Kausik-A
     - srprash
+    - jj22ee
 
   instrumentation/opentelemetry-instrumentation-tortoiseorm:
     - tonybaloney

CHANGELOG.md

@@ -17,9 +17,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#3664](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3664))
 - `opentelemetry-instrumentation-asgi`: Make all user hooks failsafe and record exceptions in hooks.
   ([#3664](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3664))
+- `opentelemetry-instrumentation-fastapi`: Fix memory leak in `uninstrument_app()` by properly removing apps from the tracking set
+  ([#3688](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3688)
+- `opentelemetry-instrumentation-tornado` Fix server (request) duration metric calculation
+  ([#3679](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3679))
 - `opentelemetry-instrumentation`: Avoid calls to `context.detach` with `None` token.
   ([#3673](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3673))
 
+### Added
+
+- `opentelemetry-instrumentation-confluent-kafka` Add support for confluent-kafka <=2.11.0
+  ([#3685](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3685))
+- `opentelemetry-instrumentation-system-metrics`: Add `cpython.gc.collected_objects` and `cpython.gc.uncollectable_objects` metrics
+  ([#3666](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3666))
+- `opentelemetry-sdk-extension-aws` Add AWS X-Ray Remote Sampler with initial Rules Poller implementation
+  ([#3366](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3366))
+
 ## Version 1.36.0/0.57b0 (2025-07-29)
 
 ### Fixed
@@ -120,7 +133,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Deprecated
 
 - Drop support for Python 3.8, bump baseline to Python 3.9.
-([#3399](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3399))
+  ([#3399](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3399))
 
 ## Version 1.33.0/0.54b0 (2025-05-09)
 

README.md

@@ -116,12 +116,12 @@ Meeting notes are available as a public [Google doc](https://docs.google.com/doc
 - [Aaron Abbott](https://github.com/aabmass), Google
 - [Leighton Chen](https://github.com/lzchen), Microsoft
 - [Riccardo Magliocchetti](https://github.com/xrmx), Elastic
-- [Shalev Roda](https://github.com/shalevr), Cisco
 
 For more information about the maintainer role, see the [community repository](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#maintainer).
 
 ### Approvers
 
+- [Dylan Russell](https://github.com/dylanrussell), Google
 - [Emídio Neto](https://github.com/emdneto), PicPay
 - [Jeremy Voss](https://github.com/jeremydvoss), Microsoft
 - [Owais Lone](https://github.com/owais), Splunk
@@ -137,6 +137,7 @@ For more information about the approver role, see the [community repository](htt
 - [Alex Boten](https://github.com/codeboten)
 - [Diego Hurtado](https://github.com/ocelotl)
 - [Owais Lone](https://github.com/owais)
+- [Shalev Roda](https://github.com/shalevr)
 - [Yusuke Tsutsumi](https://github.com/toumorokoshi)
 
 For more information about the emeritus role, see the [community repository](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#emeritus-maintainerapprovertriager).

docs-requirements.txt

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

instrumentation/README.md

@@ -17,7 +17,7 @@
 | [opentelemetry-instrumentation-cassandra](./opentelemetry-instrumentation-cassandra) | cassandra-driver ~= 3.25,scylla-driver ~= 3.25 | No | development
 | [opentelemetry-instrumentation-celery](./opentelemetry-instrumentation-celery) | celery >= 4.0, < 6.0 | No | development
 | [opentelemetry-instrumentation-click](./opentelemetry-instrumentation-click) | click >= 8.1.3, < 9.0.0 | No | development
-| [opentelemetry-instrumentation-confluent-kafka](./opentelemetry-instrumentation-confluent-kafka) | confluent-kafka >= 1.8.2, <= 2.7.0 | No | development
+| [opentelemetry-instrumentation-confluent-kafka](./opentelemetry-instrumentation-confluent-kafka) | confluent-kafka >= 1.8.2, <= 2.11.0 | No | development
 | [opentelemetry-instrumentation-dbapi](./opentelemetry-instrumentation-dbapi) | dbapi | No | development
 | [opentelemetry-instrumentation-django](./opentelemetry-instrumentation-django) | django >= 1.10 | Yes | development
 | [opentelemetry-instrumentation-elasticsearch](./opentelemetry-instrumentation-elasticsearch) | elasticsearch >= 6.0 | No | development

instrumentation/opentelemetry-instrumentation-confluent-kafka/pyproject.toml

@@ -32,7 +32,7 @@ dependencies = [
 
 [project.optional-dependencies]
 instruments = [
-  "confluent-kafka >= 1.8.2, <= 2.7.0",
+  "confluent-kafka >= 1.8.2, <= 2.11.0",
 ]
 
 [project.entry-points.opentelemetry_instrumentor]

instrumentation/opentelemetry-instrumentation-confluent-kafka/src/opentelemetry/instrumentation/confluent_kafka/package.py

@@ -13,4 +13,4 @@
 # limitations under the License.
 
 
-_instruments = ("confluent-kafka >= 1.8.2, <= 2.7.0",)
+_instruments = ("confluent-kafka >= 1.8.2, <= 2.11.0",)

instrumentation/opentelemetry-instrumentation-confluent-kafka/test-requirements.txt

@@ -1,5 +1,5 @@
 asgiref==3.8.1
-confluent-kafka==2.6.1
+confluent-kafka==2.11.0
 Deprecated==1.2.14
 iniconfig==2.0.0
 packaging==24.0

instrumentation/opentelemetry-instrumentation-fastapi/src/opentelemetry/instrumentation/fastapi/__init__.py

@@ -186,6 +186,7 @@ def client_response_hook(span: Span, scope: dict[str, Any], message: dict[str, A
 import logging
 import types
 from typing import Collection, Literal
+from weakref import WeakSet as _WeakSet
 
 import fastapi
 from starlette.applications import Starlette
@@ -415,6 +416,11 @@ def uninstrument_app(app: fastapi.FastAPI):
         app.middleware_stack = app.build_middleware_stack()
         app._is_instrumented_by_opentelemetry = False
 
+        # Remove the app from the set of instrumented apps to avoid calling uninstrument twice
+        # if the instrumentation is later disabled or such
+        # Use discard to avoid KeyError if already GC'ed
+        _InstrumentedFastAPI._instrumented_fastapi_apps.discard(app)
+
     def instrumentation_dependencies(self) -> Collection[str]:
         return _instruments
 
@@ -445,7 +451,11 @@ def _instrument(self, **kwargs):
         fastapi.FastAPI = _InstrumentedFastAPI
 
     def _uninstrument(self, **kwargs):
-        for instance in _InstrumentedFastAPI._instrumented_fastapi_apps:
+        # Create a copy of the set to avoid RuntimeError during iteration
+        instances_to_uninstrument = list(
+            _InstrumentedFastAPI._instrumented_fastapi_apps
+        )
+        for instance in instances_to_uninstrument:
             self.uninstrument_app(instance)
         _InstrumentedFastAPI._instrumented_fastapi_apps.clear()
         fastapi.FastAPI = self._original_fastapi
@@ -463,7 +473,8 @@ class _InstrumentedFastAPI(fastapi.FastAPI):
     _http_capture_headers_sanitize_fields: list[str] | None = None
     _exclude_spans: list[Literal["receive", "send"]] | None = None
 
-    _instrumented_fastapi_apps = set()
+    # Track instrumented app instances using weak references to avoid GC leaks
+    _instrumented_fastapi_apps = _WeakSet()
     _sem_conv_opt_in_mode = _StabilityMode.DEFAULT
 
     def __init__(self, *args, **kwargs):
@@ -483,10 +494,6 @@ def __init__(self, *args, **kwargs):
         )
         _InstrumentedFastAPI._instrumented_fastapi_apps.add(self)
 
-    def __del__(self):
-        if self in _InstrumentedFastAPI._instrumented_fastapi_apps:
-            _InstrumentedFastAPI._instrumented_fastapi_apps.remove(self)
-
 
 def _get_route_details(scope):
     """

instrumentation/opentelemetry-instrumentation-fastapi/tests/test_fastapi_instrumentation.py

@@ -14,8 +14,10 @@
 
 # pylint: disable=too-many-lines
 
+import gc as _gc
 import logging
 import unittest
+import weakref as _weakref
 from contextlib import ExitStack
 from timeit import default_timer
 from unittest.mock import Mock, call, patch
@@ -1404,6 +1406,16 @@ def test_mark_span_internal_in_presence_of_span_from_other_framework(self):
         )
 
 
+class TestFastAPIGarbageCollection(unittest.TestCase):
+    def test_fastapi_app_is_collected_after_instrument(self):
+        app = fastapi.FastAPI()
+        otel_fastapi.FastAPIInstrumentor().instrument_app(app)
+        app_ref = _weakref.ref(app)
+        del app
+        _gc.collect()
+        self.assertIsNone(app_ref())
+
+
 @patch.dict(
     "os.environ",
     {