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

fix(gevent): unload time but not typing modules for module cloning #5135

Merged
merged 7 commits into from
Feb 16, 2023
Merged

fix(gevent): unload time but not typing modules for module cloning #5135

Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
74449a4
Unload time, don't unload typing
Yun-Kim Feb 15, 2023
7da90b1
Test gunicorn/gevent on all Python versions to see what works
Yun-Kim Feb 15, 2023
89f3288
Split typing into separate branch, update riotfile (no 2.7)
Yun-Kim Feb 15, 2023
86eeb8b
Reset gunicorn tests to run with Python >= 3.8
Yun-Kim Feb 15, 2023
b10c991
Merge branch '1.x' into yunkim/module-cloning-typing-time
P403n1x87 Feb 16, 2023
e5face7
Fix incorrect version check for typing
Yun-Kim Feb 16, 2023
2564674
Merge branch '1.x' into yunkim/module-cloning-typing-time
P403n1x87 Feb 16, 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
10 changes: 10 additions & 0 deletions ddtrace/bootstrap/sitecustomize.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,14 @@
import os # noqa


"""
The following modules cause problems when being unloaded/reloaded in module cloning.
Notably, unloading the atexit module will remove all registered hooks which we use for cleaning up on tracer shutdown.
The other listed modules internally maintain some state that does not coexist well if reloaded.
"""
MODULES_TO_NOT_CLEANUP = {"atexit", "asyncio", "attr", "concurrent", "ddtrace", "logging"}
if sys.version_info <= (3, 7):
Yun-Kim marked this conversation as resolved.
Show resolved Hide resolved
MODULES_TO_NOT_CLEANUP |= {"typing"} # required by older versions of Python
if sys.version_info <= (2, 7):
MODULES_TO_NOT_CLEANUP |= {"encodings", "codecs"}
import imp
Expand Down Expand Up @@ -72,6 +79,9 @@ def cleanup_loaded_modules(aggressive=False):
break
else:
del sys.modules[module_name]
# Some versions of CPython import the time module during interpreter startup, which needs to be unloaded.
if "time" in sys.modules:
del sys.modules["time"]


will_run_module_cloning = should_cleanup_loaded_modules()
Expand Down