disable dynamic instrumentation

Author: majorgreys

.riot/requirements/13a3198.txt

@@ -0,0 +1,19 @@
+#
+# This file is autogenerated by pip-compile with Python 3.12
+# by the following command:
+#
+#    pip-compile --no-annotate .riot/requirements/13a3198.in
+#
+attrs==23.1.0
+coverage[toml]==7.3.0
+hypothesis==6.45.0
+iniconfig==2.0.0
+mock==5.1.0
+msgpack==1.0.5
+opentracing==2.4.0
+packaging==23.1
+pluggy==1.3.0
+pytest==7.4.0
+pytest-cov==4.1.0
+pytest-mock==3.11.1
+sortedcontainers==2.4.0

.riot/requirements/1540a76.txt

@@ -0,0 +1,22 @@
+#
+# This file is autogenerated by pip-compile with Python 3.12
+# by the following command:
+#
+#    pip-compile --no-annotate .riot/requirements/1540a76.in
+#
+attrs==23.1.0
+coverage[toml]==7.3.0
+httpretty==1.1.4
+hypothesis==6.45.0
+iniconfig==2.0.0
+mock==5.1.0
+msgpack==1.0.5
+opentracing==2.4.0
+packaging==23.1
+pluggy==1.3.0
+pytest==7.4.0
+pytest-asyncio==0.21.1
+pytest-cov==4.1.0
+pytest-mock==3.11.1
+sortedcontainers==2.4.0
+typing-extensions==4.7.1

.riot/requirements/19535a2.txt

@@ -0,0 +1,18 @@
+#
+# This file is autogenerated by pip-compile with Python 3.12
+# by the following command:
+#
+#    pip-compile --no-annotate .riot/requirements/19535a2.in
+#
+attrs==23.1.0
+coverage[toml]==7.3.0
+hypothesis==6.45.0
+iniconfig==2.0.0
+mock==5.1.0
+opentracing==2.4.0
+packaging==23.1
+pluggy==1.3.0
+pytest==7.4.0
+pytest-cov==4.1.0
+pytest-mock==3.11.1
+sortedcontainers==2.4.0

ddtrace/bootstrap/sitecustomize.py

@@ -161,9 +161,13 @@ def _(threading):
         import ddtrace.profiling.auto  # noqa: F401
 
     if di_config.enabled or ed_config.enabled:
-        from ddtrace.debugging import DynamicInstrumentation
+        # FIXME[python-3.12]: blocked on bytecode release https://github.com/MatthieuDartiailh/bytecode/pull/122
+        if not sys.version_info >= (3, 12):
+            from ddtrace.debugging import DynamicInstrumentation
 
-        DynamicInstrumentation.enable()
+            DynamicInstrumentation.enable()
+        else:
+            log.warning("Dynamic Instrumentation is not supported with Python 3.12 and cannot be enabled.")
 
     if config._runtime_metrics_enabled:
         RuntimeWorker.enable()

ddtrace/debugging/__init__.py

@@ -17,6 +17,10 @@
 
     # Disable the debugger
     DynamicInstrumentation.disable()
+
+.. note::
+    Dynamic Instrumentation is not supported with Python 3.12.
+
 """
 
 from ddtrace.debugging._debugger import Debugger as DynamicInstrumentation

riotfile.py

@@ -350,7 +350,7 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION):
                 "pytest-asyncio": latest,
             },
             # FIXME[python-3.12]: blocked on bytecode release https://github.com/MatthieuDartiailh/bytecode/pull/122
-            pys=select_pys(min_version="3.7", max_version="3.11"),
+            pys=select_pys(min_version="3.7", max_version="3.12"),
         ),
         Venv(
             name="vendor",

tests/debugging/function/__init__.py

@@ -0,0 +1,7 @@
+import sys
+
+import pytest
+
+
+if sys.version_info[:2] == (3, 12):
+    pytest.skip("Dynamic instrumentation is not supported with Python 3.12", allow_module_level=True)

tests/debugging/test_api.py

@@ -1,13 +1,24 @@
+import sys
+
 import pytest
 
 
+@pytest.mark.skipif(sys.version_info >= (3, 12), reason="Dynamic Instrumentation is not supported with Python 3.11")
 @pytest.mark.subprocess(ddtrace_run=True, env=dict(DD_DYNAMIC_INSTRUMENTATION_ENABLED="true"), err=None)
 def test_debugger_enabled_ddtrace_run():
     from ddtrace.debugging import DynamicInstrumentation
 
     assert DynamicInstrumentation._instance is not None
 
 
+@pytest.mark.skipif(sys.version_info < (3, 12), reason="Dynamic Instrumentation disabled for Python 3.12")
+@pytest.mark.subprocess(ddtrace_run=True, env=dict(DD_DYNAMIC_INSTRUMENTATION_ENABLED="true"), err=None)
+def test_debugger_enabled_ddtrace_run_py312():
+    from ddtrace.debugging import DynamicInstrumentation
+
+    assert DynamicInstrumentation._instance is None
+
+
 @pytest.mark.subprocess(ddtrace_run=True, err=None)
 def test_debugger_disabled_ddtrace_run():
     from ddtrace.debugging import DynamicInstrumentation

tests/debugging/test_debugger.py

@@ -32,6 +32,10 @@
 from tests.utils import call_program
 
 
+if sys.version_info[:2] == (3, 12):
+    pytest.skip("Dynamic instrumentation is not supported with Python 3.12", allow_module_level=True)
+
+
 def good_probe():
     # DEV: We build this on demand to ensure that rate limiting gets reset.
     return create_snapshot_line_probe(

tests/debugging/test_debugger_span_decoration.py

@@ -1,6 +1,8 @@
 # -*- encoding: utf-8 -*-
 import sys
 
+import pytest
+
 import ddtrace
 from ddtrace.debugging._probe.model import ProbeEvaluateTimingForMethod
 from ddtrace.debugging._probe.model import SpanDecoration
@@ -16,6 +18,10 @@
 from tests.utils import TracerTestCase
 
 
+if sys.version_info[:2] == (3, 12):
+    pytest.skip("Dynamic instrumentation is not supported with Python 3.12", allow_module_level=True)
+
+
 class SpanDecorationProbeTestCase(TracerTestCase):
     def setUp(self):
         super(SpanDecorationProbeTestCase, self).setUp()

tests/debugging/test_expressions.py

@@ -1,11 +1,16 @@
 from dis import dis
+import sys
 
 import pytest
 
 from ddtrace.debugging._expressions import dd_compile
 from ddtrace.internal.safety import SafeObjectProxy
 
 
+if sys.version_info[:2] == (3, 12):
+    pytest.skip("Dynamic instrumentation is not supported with Python 3.12", allow_module_level=True)
+
+
 class SideEffect(Exception):
     pass