Merge branch 'vlad/lockprof-fix-threading-mod-cloning-bug' into vlad/lock-remove-is-internal-concept

Author: vlad-scherbich

ddtrace/profiling/collector/_lock.pyx

@@ -143,6 +143,23 @@ class _ProfiledLock:
         except (AttributeError, TypeError):
             pass
 
+    # gevent compatibility — gevent's _patch_existing_locks calls
+    # type(threading.RLock()) to determine the RLock type, then scans gc.get_objects()
+    # for instances of that type. When our wrapper is on threading.RLock, the type is
+    # _ProfiledLock, so ALL profiled lock instances match. gevent then checks each for
+    # _owner/_RLock__owner; without this property, non-RLock wrappers (e.g. Lock) fail
+    # the check, causing AssertionError("Found unknown lock implementation").
+    @property
+    def _owner(self) -> int | None:
+        return getattr(self.__wrapped__, "_owner", None)
+
+    @_owner.setter
+    def _owner(self, value: int) -> None:
+        try:
+            self.__wrapped__._owner = value
+        except (AttributeError, TypeError):
+            pass
+
     # DUNDER methods
 
     def __eq__(self, other: object) -> bool:

tests/profiling/collector/test_threading.py

@@ -208,7 +208,7 @@ def test_lock_patching_survives_module_reimport():
     import sys
     import threading
 
-    from ddtrace.profiling.collector._lock import LockAllocatorWrapper
+    from ddtrace.profiling.collector._lock import _LockAllocatorWrapper as LockAllocatorWrapper
     from ddtrace.profiling.collector._lock import _ProfiledLock
     from ddtrace.profiling.collector.threading import ThreadingLockCollector
 
@@ -245,7 +245,7 @@ def test_lock_unpatch_after_module_reimport():
     import sys
     import threading
 
-    from ddtrace.profiling.collector._lock import LockAllocatorWrapper
+    from ddtrace.profiling.collector._lock import _LockAllocatorWrapper as LockAllocatorWrapper
     from ddtrace.profiling.collector.threading import ThreadingLockCollector
 
     collector = ThreadingLockCollector()