update

Author: taegyunkim

ddtrace/internal/_unpatched.py

@@ -3,21 +3,15 @@
 from builtins import open as unpatched_open  # noqa
 from json import loads as unpatched_json_loads  # noqa
 
-# Acquire references to threading and gc, then remove them from sys.modules.
-# Some parts of the library (e.g. the profiler) might be enabled programmatically
-# and patch the threading and gc modules. We store references to the original
-# modules here to allow ddtrace internal modules to access the right versions of
-# the modules.
+# Acquire a reference to the threading module. Some parts of the library (e.g.
+# the profiler) might be enabled programmatically and therefore might end up
+# getting a reference to the tracee's threading module. By storing a reference
+# to the threading module used by ddtrace here, we make it easy for those parts
+# to get a reference to the right threading module.
+import threading as _threading  # noqa
+import gc as _gc  # noqa
 
-import gc  # noqa
 import sys
-import threading  # noqa
-
-_threading = threading
-_gc = gc
-
-sys.modules.pop("threading", None)
-sys.modules.pop("gc", None)
 
 previous_loaded_modules = frozenset(sys.modules.keys())
 from subprocess import Popen as unpatched_Popen  # noqa # nosec B404

tests/profiling_v2/collector/test_threading.py

@@ -111,8 +111,7 @@ def test_patch(
 
 
 @pytest.mark.subprocess(
-    env=dict(WRAPT_DISABLE_EXTENSIONS="True", DD_PROFILING_FILE_PATH=__file__, DD_PROFILING_ENABLED="1"),
-    ddtrace_run=True,
+    env=dict(WRAPT_DISABLE_EXTENSIONS="True", DD_PROFILING_FILE_PATH=__file__),
 )
 def test_wrapt_disable_extensions() -> None:
     import os
@@ -361,7 +360,7 @@ def validate_and_cleanup() -> None:
     validate_and_cleanup()
 
 
-@pytest.mark.subprocess(env=dict(DD_PROFILING_ENABLE_ASSERTS="true", DD_PROFILING_ENABLED="1"), ddtrace_run=True)
+@pytest.mark.subprocess(env=dict(DD_PROFILING_ENABLE_ASSERTS="true"))
 def test_assertion_error_raised_with_enable_asserts():
     """Ensure that AssertionError is propagated when config.enable_asserts=True."""
     import threading
@@ -388,7 +387,7 @@ def test_assertion_error_raised_with_enable_asserts():
             lock.acquire()
 
 
-@pytest.mark.subprocess(env=dict(DD_PROFILING_ENABLE_ASSERTS="false", DD_PROFILING_ENABLED="1"), ddtrace_run=True)
+@pytest.mark.subprocess(env=dict(DD_PROFILING_ENABLE_ASSERTS="false"))
 def test_all_exceptions_suppressed_by_default() -> None:
     """
     Ensure that exceptions are silently suppressed in the `_acquire` method