fix(profiling): wrap del with try/except [backport 3.3] #12840
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
```Python
start = None
if hasattr(self, "_self_acquired_at"):
# _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
```
Above code can raise an `AttributeError`, if there are multiple threads
calling on `release()`. Though in such scenarios, except for the thread
which actually held and released the lock, such threads would result in
a `RuntimeError`, the current behavior makes customers blame our code
instead of theirs.
The following code, by @nsrip-dd, can be used to check whether the code
raises an error or not
```Python
import threading
import sys
sys.setswitchinterval(0.0000001)
def unlock(l):
try:
l.release()
except RuntimeError:
pass
except Exception as e:
raise e
while True:
l = threading.Lock()
l.acquire()
threads = [threading.Thread(target=unlock, args=[l,]) for _ in range(64)]
for t in threads:
t.start()
for t in threads:
t.join()
```
## Checklist
- [x] PR author has checked that all the criteria below are met
- The PR description includes an overview of the change
- The PR description articulates the motivation for the change
- The change includes tests OR the PR description describes a testing
strategy
- The PR description notes risks associated with the change, if any
- Newly-added code is easy to change
- The change follows the [library release note
guidelines](https://ddtrace.readthedocs.io/en/stable/releasenotes.html)
- The change includes or references documentation updates if necessary
- Backport labels are set (if
[applicable](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting))
## Reviewer Checklist
- [x] Reviewer has checked that all the criteria below are met
- Title is accurate
- All changes are related to the pull request's stated goal
- Avoids breaking
[API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces)
changes
- Testing strategy adequately addresses listed risks
- Newly-added code is easy to change
- Release note makes sense to a user of the library
- If necessary, author has acknowledged and discussed the performance
implications of this PR as reported in the benchmarks PR comment
- Backport labels are set in a manner that is consistent with the
[release branch maintenance
policy](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting)
(cherry picked from commit 5c8fb46)
taegyunkim
approved these changes
Mar 21, 2025
Contributor
Author
|
|
Contributor
Author
Bootstrap import analysisComparison of import times between this PR and main. SummaryThe average import time in this PR is: 256 ± 6 ms. The average import time in main is: 256 ± 8 ms. The import time difference between this PR and main is: -0.3 ± 0.3 ms. The difference is not statistically significant (z = -1.02). Import time breakdownThe following import paths have appeared:
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backport 5c8fb46 from #12833 to 3.3.
Above code can raise an
AttributeError, if there are multiple threads calling onrelease(). Though in such scenarios, except for the thread which actually held and released the lock, such threads would result in aRuntimeError, the current behavior makes customers blame our code instead of theirs.The following code, by @nsrip-dd, can be used to check whether the code raises an error or not
Checklist
Reviewer Checklist