Skip to content

fix(profiling): Handle non frame types in profiler #1965

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
Zylphrex merged 6 commits into from
Mar 20, 2023
Merged

fix(profiling): Handle non frame types in profiler #1965

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1b62252
fix(profiling): Handle non frame types in profiler
Zylphrex Mar 20, 2023
e1c150f
Merge branch 'master' into txiao/fix/handle-non-frame-types-in-profiler
Zylphrex Mar 20, 2023
2f00e84
bump
Zylphrex Mar 20, 2023
1669c3a
fix bad dependency in tests
Zylphrex Mar 20, 2023
36db34c
remove dep change
Zylphrex Mar 20, 2023
9dea278
Merge branch 'master' into txiao/fix/handle-non-frame-types-in-profiler
Zylphrex Mar 20, 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
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 @@ -26,6 +26,7 @@
from sentry_sdk._compat import PY33, PY311
from sentry_sdk._types import TYPE_CHECKING
from sentry_sdk.utils import (
capture_internal_exception,
filename_for_module,
is_valid_sample_rate,
logger,
Expand Down Expand Up @@ -252,8 +253,16 @@ def extract_stack(
frames = deque(maxlen=max_stack_depth) # type: Deque[FrameType]

while frame is not None:
try:
f_back = frame.f_back
except AttributeError:
capture_internal_exception(sys.exc_info())
# For some reason, the frame we got isn't a `FrameType` and doesn't
# have a `f_back`. When this happens, we continue with any frames
# that we've managed to extract up to this point.
break
frames.append(frame)
frame = frame.f_back
frame = f_back

if prev_cache is None:
stack = tuple(extract_frame(frame, cwd) for frame in frames)
Expand Down