Skip to content

Handle failure during thread creation #2471

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sentrivana merged 12 commits into from
Nov 2, 2023
Merged

Handle failure during thread creation #2471

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
58568fd
Handle failure during thread creation
antonpirker Oct 30, 2023
a24a1c4
Handling starting threads during startup
antonpirker Oct 31, 2023
60b5e32
typos
antonpirker Oct 31, 2023
7b03304
Merge branch 'master' into antonpirker/handle-creation-of-threads-dur…
antonpirker Oct 31, 2023
1392666
Merge branch 'master' into antonpirker/handle-creation-of-threads-dur…
sentrivana Nov 2, 2023
25b87a6
add comments
sentrivana Nov 2, 2023
807f09f
revert condition
sentrivana Nov 2, 2023
30bf13a
add profiler test
sentrivana Nov 2, 2023
842950f
add handling for gevent too
sentrivana Nov 2, 2023
3dcec2a
more tests
sentrivana Nov 2, 2023
d4302a4
also set thread to none
sentrivana Nov 2, 2023
02efaca
Merge branch 'master' into antonpirker/handle-creation-of-threads-dur…
sentrivana Nov 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
add comments
  • Loading branch information
@sentrivana
sentrivana committed Nov 2, 2023
commit 25b87a6db3092f5edbaa8f90c3b119bc1ca14cc7
7 changes: 7 additions & 0 deletions sentry_sdk/monitor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,13 @@ def __init__(self, transport, interval=10):

def _ensure_running(self):
# type: () -> None
"""
Check that the monitor has an active thread to run in, or create one if not.

Note that this might fail (e.g. in Python 3.12 it's not possible to
spawn new threads at interpreter shutdown). In that case self._running
will be False after running this function.
"""
if self._thread_for_pid == os.getpid() and self._thread is not None:
return None

Expand Down
11 changes: 10 additions & 1 deletion sentry_sdk/profiler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,7 +788,8 @@ def ensure_running(self):
def start_profiling(self, profile):
# type: (Profile) -> None
self.ensure_running()
self.new_profiles.append(profile)
if self.running:
self.new_profiles.append(profile)

def stop_profiling(self, profile):
# type: (Profile) -> None
Expand Down Expand Up @@ -898,6 +899,14 @@ def teardown(self):

def ensure_running(self):
# type: () -> None
"""
Check that the profiler has an active thread to run in, and start one if
that's not the case.

Note that this might fail (e.g. in Python 3.12 it's not possible to
spawn new threads at interpreter shutdown). In that case self.running
will be False after running this function.
"""
pid = os.getpid()

# is running on the right process
Expand Down
7 changes: 7 additions & 0 deletions sentry_sdk/sessions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,13 @@ def flush(self):

def _ensure_running(self):
# type: (...) -> None
"""
Check that we have an active thread to run in, or create one if not.

Note that this might fail (e.g. in Python 3.12 it's not possible to
spawn new threads at interpreter shutdown). In that case self._running
will be False after running this function.
"""
if self._thread_for_pid == os.getpid() and self._thread is not None:
return None
with self._thread_lock:
Expand Down