Merge branch 'main' into zachg/handle_cross_org_propagation

DataDog · Jan 10, 2025 · 721752d · 721752d
2 parents 5a40b91 + a58f139
commit 721752d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/ddtrace/profiling/collector/_lock.py b/ddtrace/profiling/collector/_lock.py
@@ -185,6 +185,7 @@ def _release(self, inner_func, *args, **kwargs):
             # _self_acquired_at is only set when the acquire was captured
             # if it's not set, we're not capturing the release
             start = self._self_acquired_at
+            del self._self_acquired_at
 
         try:
             return inner_func(*args, **kwargs)

diff --git a/releasenotes/notes/profiling-lock-acquired-at-remove-c8b5b96130a46ca8.yaml b/releasenotes/notes/profiling-lock-acquired-at-remove-c8b5b96130a46ca8.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    profiling: resolves an issue where lock release would have been captured
+    with a wrong acquire timestamp