Skip to content
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

Jump to bottom

Patch eventlet under Sentry SDK #2464

Merged
merged 11 commits into from
Oct 25, 2023
Merged

Patch eventlet under Sentry SDK #2464

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
07517cb
Patch eventlet on Sentry SDK
guiscaranse Nov 18, 2021
e584049
Update sequence
guiscaranse Nov 18, 2021
b411c96
Remove redundant stuff
guiscaranse Nov 19, 2021
55ce654
fix codestyle
guiscaranse Nov 19, 2021
b6fbc20
Merge branch 'master' into master
guiscaranse Jun 26, 2023
f77d14e
Merge branch 'master' into szokeasaurusrex/patch-eventlet-under-sentr…
szokeasaurusrex Oct 25, 2023
9dd50a4
Applied Black formatting to utils.py
szokeasaurusrex Oct 25, 2023
53955e0
Add greenlet to linter requirements
szokeasaurusrex Oct 25, 2023
e912cb1
Removed greenlet from linter-requirements, added type ignore to import
szokeasaurusrex Oct 25, 2023
4fa49e0
Use parse_version
szokeasaurusrex Oct 25, 2023
c70a7da
Fixed mypy error
szokeasaurusrex Oct 25, 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/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1159,9 +1159,18 @@
pass

try:
import greenlet # type: ignore
from eventlet.patcher import is_monkey_patched # type: ignore

if is_monkey_patched("thread"):
greenlet_version = parse_version(greenlet.__version__)

Check warning on line 1165 in sentry_sdk/utils.py

View check run for this annotation

Codecov / codecov/patch

sentry_sdk/utils.py#L1165 

Added line #L1165 was not covered by tests

if greenlet_version is None:
logger.error(

Check warning on line 1168 in sentry_sdk/utils.py

View check run for this annotation

Codecov / codecov/patch

sentry_sdk/utils.py#L1168 

Added line #L1168 was not covered by tests
"Internal error in Sentry SDK: Could not parse Greenlet version from greenlet.__version__."
)
return False

Check warning on line 1171 in sentry_sdk/utils.py

View check run for this annotation

Codecov / codecov/patch

sentry_sdk/utils.py#L1171 

Added line #L1171 was not covered by tests

if is_monkey_patched("thread") and greenlet_version < (0, 5):
return True
except ImportError:
pass
Expand Down
Loading