[mq] [skip ddci] working branch - merge 7e34962 on top of main at e6513ea

{"baseBranch":"main","baseCommit":"e6513eaaf42e37f4bbd194349846be01527586d3","createdAt":"2026-08-28T10:46:53.208055Z","headSha":"7e3496229f4ca409c11bde49ce59ca9e2dc4e54d","id":"e3a2a866-bc30-4fa0-bf33-87d1fb83efb5","mergeMethod":"squash","priority":"200","pullRequestNumber":"17849","queuedAt":"2026-08-28T10:46:53.206453Z","retryAttempt":"3","status":"STATUS_QUEUED"}

Author: gh-worker-dd-mergequeue-cf854d[bot]

ddtrace/debugging/_function/store.py

@@ -7,6 +7,7 @@
 from ddtrace.debugging._function.discovery import FullyNamed
 from ddtrace.internal.bytecode_injection import HookInfoType
 from ddtrace.internal.bytecode_injection import HookType
+from ddtrace.internal.bytecode_injection import eject_all_hooks
 from ddtrace.internal.bytecode_injection import eject_hooks
 from ddtrace.internal.bytecode_injection import inject_hooks
 from ddtrace.internal.wrapping import get_function_code
@@ -89,5 +90,14 @@ def unwrap(self, function: FullyNamedContextWrappedFunction) -> None:
 
     def restore_all(self) -> None:
         """Restore all the patched functions to their original form."""
+        for function, wrapping_context in list(self._wrapper_map.items()):
+            wrapping_context.unwrap()
+
         for function, code in self._code_map.items():
+            # Restoring __code__ alone would leave 3.15+ line hooks (keyed by
+            # code object) still firing.
+            eject_all_hooks(function)
             function.__code__ = code
+
+        self._code_map.clear()
+        self._wrapper_map.clear()