new tests with different config settings

Author: vlad-scherbich

ddtrace/profiling/collector/_lock.py

@@ -29,8 +29,10 @@
 from ddtrace.trace import Tracer
 
 
-ACQUIRE_RELEASE_CO_NAMES: List[str] = ["_acquire", "_release"]
-ENTER_EXIT_CO_NAMES: List[str] = ["acquire", "release", "__enter__", "__exit__", "__aenter__", "__aexit__"]
+ACQUIRE_RELEASE_CO_NAMES: frozenset[str] = frozenset(["_acquire", "_release"])
+ENTER_EXIT_CO_NAMES: frozenset[str] = frozenset(
+    ["acquire", "release", "__enter__", "__exit__", "__aenter__", "__aexit__"]
+)
 
 
 def _current_thread() -> Tuple[int, str]:
@@ -238,11 +240,11 @@ def _maybe_update_self_name(self) -> None:
         if config.enable_asserts:
             frame: FrameType = sys._getframe(1)
             if frame.f_code.co_name not in ACQUIRE_RELEASE_CO_NAMES:
-                raise AssertionError("Unexpected frame %s" % frame.f_code.co_name)
+                raise AssertionError(f"Unexpected frame in stack: '{frame.f_code.co_name}'")
 
             frame = sys._getframe(2)
             if frame.f_code.co_name not in ENTER_EXIT_CO_NAMES:
-                raise AssertionError("Unexpected frame %s" % frame.f_code.co_name)
+                raise AssertionError(f"Unexpected frame in stack: '{frame.f_code.co_name}'")
 
         # First, look at the local variables of the caller frame, and then the global variables
         frame = sys._getframe(3)

releasenotes/notes/fixed-silent-suppression-of-AssertionError-exceptions-in-Lock-profiler-20645079ab43b23d.yaml

@@ -1,4 +1,4 @@
 ---
 fixes:
   - |
-    profiling: This fix resolves an issue where AssertionError exceptions were silently suppressed in the `_acquire` method of the Lock profiler (note: this only occurs when assertions are enabled.)
+    profiling: This fix resolves an issue where AssertionError exceptions were silently suppressed in the `_acquire` method of the Lock profiler (note: this only occurs when assertions are enabled.)

tests/profiling_v2/collector/test_threading.py

@@ -360,6 +360,70 @@ def validate_and_cleanup() -> None:
     validate_and_cleanup()
 
 
+@pytest.mark.subprocess(env=dict(DD_PROFILING_ENABLE_ASSERTS="true"))
+def test_assertion_error_raised_with_enable_asserts():
+    """Ensure that AssertionError is propagated when config.enable_asserts=True."""
+    import threading
+
+    import mock
+    import pytest
+
+    from ddtrace.internal.datadog.profiling import ddup
+    from ddtrace.profiling.collector.threading import ThreadingLockCollector
+
+    # Initialize ddup (required before using collectors)
+    assert ddup.is_available, "ddup is not available"
+    ddup.config(env="test", service="test_asserts", version="1.0", output_filename="/tmp/test_asserts")
+    ddup.start()
+
+    with ThreadingLockCollector(capture_pct=100):
+        lock = threading.Lock()
+
+        # Patch _maybe_update_self_name to raise AssertionError
+        lock._maybe_update_self_name = mock.Mock(side_effect=AssertionError("test: unexpected frame in stack"))
+
+        with pytest.raises(AssertionError):
+            # AssertionError should be propagated when enable_asserts=True
+            lock.acquire()
+
+
+@pytest.mark.subprocess(env=dict(DD_PROFILING_ENABLE_ASSERTS="false"))
+def test_all_exceptions_suppressed_by_default() -> None:
+    """
+    Ensure that exceptions are silently suppressed in the `_acquire` method
+    when config.enable_asserts=False (default).
+    """
+    import threading
+
+    import mock
+
+    from ddtrace.internal.datadog.profiling import ddup
+    from ddtrace.profiling.collector.threading import ThreadingLockCollector
+
+    # Initialize ddup (required before using collectors)
+    assert ddup.is_available, "ddup is not available"
+    ddup.config(env="test", service="test_exceptions", version="1.0", output_filename="/tmp/test_exceptions")
+    ddup.start()
+
+    with ThreadingLockCollector(capture_pct=100):
+        lock = threading.Lock()
+
+        # Patch _maybe_update_self_name to raise AssertionError
+        lock._maybe_update_self_name = mock.Mock(side_effect=AssertionError("Unexpected frame in stack: 'fubar'"))
+        lock.acquire()
+        lock.release()
+
+        # Patch _maybe_update_self_name to raise RuntimeError
+        lock._maybe_update_self_name = mock.Mock(side_effect=RuntimeError("Some profiling error"))
+        lock.acquire()
+        lock.release()
+
+        # Patch _maybe_update_self_name to raise Exception
+        lock._maybe_update_self_name = mock.Mock(side_effect=Exception("Wut happened?!?!"))
+        lock.acquire()
+        lock.release()
+
+
 class BaseThreadingLockCollectorTest:
     # These should be implemented by child classes
     @property
@@ -979,32 +1043,6 @@ def test_upload_resets_profile(self) -> None:
         with pytest.raises(AssertionError):
             pprof_utils.parse_newest_profile(self.output_filename)
 
-    def test_assertion_exceptions_raised_in_acquire(self) -> None:
-        """Ensure that AssertionError exceptions is propagated in the `_acquire` method."""
-
-        with self.collector_class(capture_pct=100):
-            lock = self.lock_class()
-
-            # Patch _maybe_update_self_name to raise AssertionError
-            lock._maybe_update_self_name = mock.Mock(side_effect=AssertionError("test: unexpected frame in stack"))
-
-            with pytest.raises(AssertionError):
-                # acquire() will propagate AssertionError if _maybe_update_self_name raises it
-                lock.acquire()
-
-    def test_non_assertion_exceptions_suppressed_in_acquire(self) -> None:
-        """Ensure that non - AssertionError exceptions are silently suppressed in the `_acquire` method."""
-
-        with self.collector_class(capture_pct=100):
-            lock = self.lock_class()
-
-            # Patch _maybe_update_self_name to raise RuntimeError
-            lock._maybe_update_self_name = mock.Mock(side_effect=RuntimeError("Some profiling error"))
-
-            # RuntimeError should be caught and suppressed - lock operations should succeed
-            lock.acquire()
-            lock.release()
-
 
 class TestThreadingLockCollector(BaseThreadingLockCollectorTest):
     """Test Lock profiling"""