Merge branch 'main' into main

Author: emdneto

CHANGELOG.md

@@ -46,6 +46,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#3022](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3022))
 - Replace all instrumentor unit test `assertEqualSpanInstrumentationInfo` calls with `assertEqualSpanInstrumentationScope` calls
   ([#3037](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3037))
+- `opentelemetry-instrumentation-sqlalchemy`: Fix a remaining memory leak in EngineTracer
+  ([#3053](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3053))
 
 ### Breaking changes
 

docs/instrumentation/aiohttp_server/aiohttp_server.rst

@@ -0,0 +1,7 @@
+.. include:: ../../../instrumentation/opentelemetry-instrumentation-aiohttp-server/README.rst
+    :end-before: References
+
+.. automodule:: opentelemetry.instrumentation.aiohttp_server
+    :members:
+    :undoc-members:
+    :show-inheritance:

docs/instrumentation/click/click.rst

@@ -0,0 +1,7 @@
+.. include:: ../../../instrumentation/opentelemetry-instrumentation-click/README.rst
+    :end-before: References
+
+.. automodule:: opentelemetry.instrumentation.click
+    :members:
+    :undoc-members:
+    :show-inheritance:

docs/nitpick-exceptions.ini

@@ -29,6 +29,7 @@ py-class=
     httpx.SyncByteStream
     httpx.AsyncByteStream
     httpx.Response
+    aiohttp.web_request.Request
     yarl.URL
     cimpl.Producer
     cimpl.Consumer
@@ -65,7 +66,7 @@ any=
 
 py-obj=
     opentelemetry.propagators.textmap.CarrierT
-    
+
 py-func=
     poll
     flush

instrumentation/opentelemetry-instrumentation-click/README.rst

@@ -1,5 +1,5 @@
 OpenTelemetry click Instrumentation
-===========================
+====================================
 
 |pypi|
 

instrumentation/opentelemetry-instrumentation-sqlalchemy/src/opentelemetry/instrumentation/sqlalchemy/engine.py

@@ -167,13 +167,26 @@ def _pool_checkout(
         self._add_idle_to_connection_usage(-1)
         self._add_used_to_connection_usage(1)
 
+    @classmethod
+    def _dispose_of_event_listener(cls, obj):
+        try:
+            cls._remove_event_listener_params.remove(obj)
+        except ValueError:
+            pass
+
     @classmethod
     def _register_event_listener(cls, target, identifier, func, *args, **kw):
         listen(target, identifier, func, *args, **kw)
         cls._remove_event_listener_params.append(
             (weakref.ref(target), identifier, func)
         )
 
+        weakref.finalize(
+            target,
+            cls._dispose_of_event_listener,
+            (weakref.ref(target), identifier, func),
+        )
+
     @classmethod
     def remove_all_event_listeners(cls):
         for (

instrumentation/opentelemetry-instrumentation-sqlalchemy/tests/test_sqlalchemy.py

@@ -417,6 +417,10 @@ def test_no_memory_leakage_if_engine_diposed(self):
 
         from sqlalchemy import create_engine
 
+        from opentelemetry.instrumentation.sqlalchemy.engine import (
+            EngineTracer,
+        )
+
         callback = mock.Mock()
 
         def make_shortlived_engine():
@@ -432,3 +436,4 @@ def make_shortlived_engine():
 
         gc.collect()
         assert callback.call_count == 5
+        assert len(EngineTracer._remove_event_listener_params) == 0