chore(profiling): remove stack_v2_enabled=False tests [backport 2.20] (#12188)

Co-authored-by: Taegyun Kim <[email protected]>

Author: github-actions[bot]

tests/profiling_v2/collector/test_stack.py

@@ -29,7 +29,6 @@
     env=dict(
         DD_PROFILING_MAX_FRAMES="5",
         DD_PROFILING_OUTPUT_PPROF="/tmp/test_collect_truncate",
-        DD_PROFILING_STACK_V2_ENABLED="1",
     )
 )
 @pytest.mark.skipif(sys.version_info[:2] == (3, 7), reason="stack_v2 is not supported on Python 3.7")
@@ -61,9 +60,8 @@ def test_collect_truncate():
         assert len(sample.location_id) <= max_nframes + 2, len(sample.location_id)
 
 
-@pytest.mark.parametrize("stack_v2_enabled", [True, False])
-def test_stack_locations(stack_v2_enabled, tmp_path):
-    if sys.version_info[:2] == (3, 7) and stack_v2_enabled:
+def test_stack_locations(tmp_path):
+    if sys.version_info[:2] == (3, 7):
         pytest.skip("stack_v2 is not supported on Python 3.7")
 
     test_name = "test_stack_locations"
@@ -83,7 +81,7 @@ def bar():
     def foo():
         bar()
 
-    with stack.StackCollector(None, _stack_collector_v2_enabled=stack_v2_enabled):
+    with stack.StackCollector(None, _stack_collector_v2_enabled=True):
         for _ in range(10):
             foo()
     ddup.upload()
@@ -117,9 +115,8 @@ def foo():
     pprof_utils.assert_profile_has_sample(profile, samples=samples, expected_sample=expected_sample)
 
 
-@pytest.mark.parametrize("stack_v2_enabled", [True, False])
-def test_push_span(stack_v2_enabled, tmp_path, tracer):
-    if sys.version_info[:2] == (3, 7) and stack_v2_enabled:
+def test_push_span(tmp_path, tracer):
+    if sys.version_info[:2] == (3, 7):
         pytest.skip("stack_v2 is not supported on Python 3.7")
 
     test_name = "test_push_span"
@@ -140,7 +137,7 @@ def test_push_span(stack_v2_enabled, tmp_path, tracer):
         tracer=tracer,
         endpoint_collection_enabled=True,
         ignore_profiler=True,  # this is not necessary, but it's here to trim samples
-        _stack_collector_v2_enabled=stack_v2_enabled,
+        _stack_collector_v2_enabled=True,
     ):
         with tracer.trace("foobar", resource=resource, span_type=span_type) as span:
             span_id = span.span_id
@@ -221,9 +218,8 @@ def target_fun():
         unregister_thread.assert_called_with(thread_id)
 
 
-@pytest.mark.parametrize("stack_v2_enabled", [True, False])
-def test_push_non_web_span(stack_v2_enabled, tmp_path, tracer):
-    if sys.version_info[:2] == (3, 7) and stack_v2_enabled:
+def test_push_non_web_span(tmp_path, tracer):
+    if sys.version_info[:2] == (3, 7):
         pytest.skip("stack_v2 is not supported on Python 3.7")
 
     tracer._endpoint_call_counter_span_processor.enable()
@@ -244,7 +240,7 @@ def test_push_non_web_span(stack_v2_enabled, tmp_path, tracer):
         tracer=tracer,
         endpoint_collection_enabled=True,
         ignore_profiler=True,  # this is not necessary, but it's here to trim samples
-        _stack_collector_v2_enabled=stack_v2_enabled,
+        _stack_collector_v2_enabled=True,
     ):
         with tracer.trace("foobar", resource=resource, span_type=span_type) as span:
             span_id = span.span_id
@@ -269,10 +265,9 @@ def test_push_non_web_span(stack_v2_enabled, tmp_path, tracer):
         )
 
 
-@pytest.mark.parametrize("stack_v2_enabled", [True, False])
-def test_push_span_none_span_type(stack_v2_enabled, tmp_path, tracer):
+def test_push_span_none_span_type(tmp_path, tracer):
     # Test for https://github.com/DataDog/dd-trace-py/issues/11141
-    if sys.version_info[:2] == (3, 7) and stack_v2_enabled:
+    if sys.version_info[:2] == (3, 7):
         pytest.skip("stack_v2 is not supported on Python 3.7")
 
     test_name = "test_push_span_none_span_type"
@@ -292,7 +287,7 @@ def test_push_span_none_span_type(stack_v2_enabled, tmp_path, tracer):
         tracer=tracer,
         endpoint_collection_enabled=True,
         ignore_profiler=True,  # this is not necessary, but it's here to trim samples
-        _stack_collector_v2_enabled=stack_v2_enabled,
+        _stack_collector_v2_enabled=True,
     ):
         # Explicitly set None span_type as the default could change in the
         # future.
@@ -484,9 +479,8 @@ def test_exception_collection_trace(stack_v2_enabled, tmp_path, tracer):
             )
 
 
-@pytest.mark.parametrize("stack_v2_enabled", [True, False])
-def test_collect_once_with_class(stack_v2_enabled, tmp_path):
-    if sys.version_info[:2] == (3, 7) and stack_v2_enabled:
+def test_collect_once_with_class(tmp_path):
+    if sys.version_info[:2] == (3, 7):
         pytest.skip("stack_v2 is not supported on Python 3.7")
 
     class SomeClass(object):
@@ -506,7 +500,7 @@ def sleep_instance(self):
     ddup.config(env="test", service=test_name, version="my_version", output_filename=pprof_prefix)
     ddup.start()
 
-    with stack.StackCollector(None, ignore_profiler=True, _stack_collector_v2_enabled=stack_v2_enabled):
+    with stack.StackCollector(None, ignore_profiler=True, _stack_collector_v2_enabled=True):
         SomeClass.sleep_class()
 
     ddup.upload()
@@ -521,7 +515,6 @@ def sleep_instance(self):
         expected_sample=pprof_utils.StackEvent(
             thread_id=_thread.get_ident(),
             thread_name="MainThread",
-            class_name="SomeClass" if not stack_v2_enabled else None,
             locations=[
                 pprof_utils.StackLocation(
                     function_name="sleep_instance",
@@ -536,16 +529,15 @@ def sleep_instance(self):
                 pprof_utils.StackLocation(
                     function_name="test_collect_once_with_class",
                     filename="test_stack.py",
-                    line_no=test_collect_once_with_class.__code__.co_firstlineno + 23,
+                    line_no=test_collect_once_with_class.__code__.co_firstlineno + 22,
                 ),
             ],
         ),
     )
 
 
-@pytest.mark.parametrize("stack_v2_enabled", [True, False])
-def test_collect_once_with_class_not_right_type(stack_v2_enabled, tmp_path):
-    if sys.version_info[:2] == (3, 7) and stack_v2_enabled:
+def test_collect_once_with_class_not_right_type(tmp_path):
+    if sys.version_info[:2] == (3, 7):
         pytest.skip("stack_v2 is not supported on Python 3.7")
 
     class SomeClass(object):
@@ -565,7 +557,7 @@ def sleep_instance(foobar, self):
     ddup.config(env="test", service=test_name, version="my_version", output_filename=pprof_prefix)
     ddup.start()
 
-    with stack.StackCollector(None, ignore_profiler=True, _stack_collector_v2_enabled=stack_v2_enabled):
+    with stack.StackCollector(None, ignore_profiler=True, _stack_collector_v2_enabled=True):
         SomeClass.sleep_class(123)
 
     ddup.upload()
@@ -580,9 +572,6 @@ def sleep_instance(foobar, self):
         expected_sample=pprof_utils.StackEvent(
             thread_id=_thread.get_ident(),
             thread_name="MainThread",
-            # stack v1 relied on using cls and self to figure out class name
-            # so we can't find it here.
-            class_name=None,
             locations=[
                 pprof_utils.StackLocation(
                     function_name="sleep_instance",
@@ -597,7 +586,7 @@ def sleep_instance(foobar, self):
                 pprof_utils.StackLocation(
                     function_name="test_collect_once_with_class_not_right_type",
                     filename="test_stack.py",
-                    line_no=test_collect_once_with_class_not_right_type.__code__.co_firstlineno + 23,
+                    line_no=test_collect_once_with_class_not_right_type.__code__.co_firstlineno + 22,
                 ),
             ],
         ),

tests/profiling_v2/collector/test_stack_asyncio.py

@@ -7,7 +7,6 @@
 @pytest.mark.subprocess(
     env=dict(
         DD_PROFILING_OUTPUT_PPROF="/tmp/test_stack_asyncio",
-        DD_PROFILING_STACK_V2_ENABLED="true",
     ),
 )
 def test_asyncio():

tests/profiling_v2/test_accuracy.py

@@ -4,57 +4,7 @@
 import pytest
 
 
-@pytest.mark.subprocess(
-    env=dict(DD_PROFILING_MAX_TIME_USAGE_PCT="100", DD_PROFILING_OUTPUT_PPROF="/tmp/test_accuracy_libdd.pprof")
-)
-def test_accuracy_libdd():
-    import collections
-    import os
-
-    from ddtrace.profiling import profiler
-    from tests.profiling.collector import pprof_utils
-    from tests.profiling.test_accuracy import assert_almost_equal
-    from tests.profiling.test_accuracy import spend_16
-
-    # Set this to 100 so we don't sleep too often and mess with the precision.
-    p = profiler.Profiler()
-    p.start()
-    spend_16()
-    p.stop()
-    wall_times = collections.defaultdict(lambda: 0)
-    cpu_times = collections.defaultdict(lambda: 0)
-    profile = pprof_utils.parse_profile(os.environ["DD_PROFILING_OUTPUT_PPROF"] + "." + str(os.getpid()))
-
-    for sample in profile.sample:
-        wall_time_index = pprof_utils.get_sample_type_index(profile, "wall-time")
-
-        wall_time_spent_ns = sample.value[wall_time_index]
-        cpu_time_index = pprof_utils.get_sample_type_index(profile, "cpu-time")
-        cpu_time_spent_ns = sample.value[cpu_time_index]
-
-        for location_id in sample.location_id:
-            location = pprof_utils.get_location_with_id(profile, location_id)
-            line = location.line[0]
-            function = pprof_utils.get_function_with_id(profile, line.function_id)
-            function_name = profile.string_table[function.name]
-            wall_times[function_name] += wall_time_spent_ns
-            cpu_times[function_name] += cpu_time_spent_ns
-
-    assert_almost_equal(wall_times["spend_3"], 9e9)
-    assert_almost_equal(wall_times["spend_1"], 2e9)
-    assert_almost_equal(wall_times["spend_4"], 4e9)
-    assert_almost_equal(wall_times["spend_16"], 16e9)
-    assert_almost_equal(wall_times["spend_7"], 7e9)
-
-    assert_almost_equal(wall_times["spend_cpu_2"], 2e9, tolerance=0.09)
-    assert_almost_equal(wall_times["spend_cpu_3"], 3e9, tolerance=0.09)
-    assert_almost_equal(cpu_times["spend_cpu_2"], 2e9, tolerance=0.09)
-    assert_almost_equal(cpu_times["spend_cpu_3"], 3e9, tolerance=0.09)
-
-
-@pytest.mark.subprocess(
-    env=dict(DD_PROFILING_STACK_V2_ENABLED="1", DD_PROFILING_OUTPUT_PPROF="/tmp/test_accuracy_stack_v2.pprof")
-)
+@pytest.mark.subprocess(env=dict(DD_PROFILING_OUTPUT_PPROF="/tmp/test_accuracy_stack_v2.pprof"))
 @pytest.mark.skipif(sys.version_info[:2] == (3, 7), reason="stack_v2 is not supported on Python 3.7")
 def test_accuracy_stack_v2():
     import collections

tests/profiling_v2/test_gunicorn.py

@@ -52,9 +52,6 @@ def _run_gunicorn(*args):
 def gunicorn(monkeypatch):
     monkeypatch.setenv("DD_PROFILING_IGNORE_PROFILER", "1")
     monkeypatch.setenv("DD_PROFILING_ENABLED", "1")
-    # This was needed for the gunicorn process to start and print worker startup
-    # messages. Without this, the test can't find the worker PIDs.
-    monkeypatch.setenv("DD_PROFILING_STACK_V2_ENABLED", "1")
 
     yield _run_gunicorn
 

tests/profiling_v2/test_main.py

@@ -11,13 +11,11 @@
 from tests.utils import flaky
 
 
-@pytest.mark.parametrize("stack_v2_enabled", [True, False])
-def test_call_script(stack_v2_enabled):
-    if sys.version_info[:2] == (3, 7) and stack_v2_enabled:
+def test_call_script():
+    if sys.version_info[:2] == (3, 7):
         pytest.skip("stack_v2 is not supported on Python 3.7")
     env = os.environ.copy()
     env["DD_PROFILING_ENABLED"] = "1"
-    env["DD_PROFILING_STACK_V2_ENABLED"] = "1" if stack_v2_enabled else "0"
     stdout, stderr, exitcode, _ = call_program(
         "ddtrace-run", sys.executable, os.path.join(os.path.dirname(__file__), "simple_program.py"), env=env
     )
@@ -28,28 +26,25 @@ def test_call_script(stack_v2_enabled):
     hello, interval, pid, stack_v2 = list(s.strip() for s in stdout.decode().strip().split("\n"))
     assert hello == "hello world", stdout.decode().strip()
     assert float(interval) >= 0.01, stdout.decode().strip()
-    assert stack_v2 == str(stack_v2_enabled)
+    assert stack_v2 == str(True)
 
 
 @pytest.mark.skipif(not os.getenv("DD_PROFILE_TEST_GEVENT", False), reason="Not testing gevent")
-@pytest.mark.parametrize("stack_v2_enabled", [True, False])
-def test_call_script_gevent(stack_v2_enabled):
-    if sys.version_info[:2] == (3, 7) and stack_v2_enabled:
+def test_call_script_gevent():
+    if sys.version_info[:2] == (3, 7):
         pytest.skip("stack_v2 is not supported on Python 3.7")
-    if sys.version_info[:2] == (3, 8) and stack_v2_enabled:
+    if sys.version_info[:2] == (3, 8):
         pytest.skip("this test is flaky on 3.8 with stack v2")
     env = os.environ.copy()
     env["DD_PROFILING_ENABLED"] = "1"
-    env["DD_PROFILING_STACK_V2_ENABLED"] = "1" if stack_v2_enabled else "0"
     stdout, stderr, exitcode, pid = call_program(
         sys.executable, os.path.join(os.path.dirname(__file__), "simple_program_gevent.py"), env=env
     )
     assert exitcode == 0, (stdout, stderr)
 
 
-@pytest.mark.parametrize("stack_v2_enabled", [True, False])
-def test_call_script_pprof_output(stack_v2_enabled, tmp_path):
-    if sys.version_info[:2] == (3, 7) and stack_v2_enabled:
+def test_call_script_pprof_output(tmp_path):
+    if sys.version_info[:2] == (3, 7):
         pytest.skip("stack_v2 is not supported on Python 3.7")
 
     """This checks if the pprof output and atexit register work correctly.
@@ -61,7 +56,6 @@ def test_call_script_pprof_output(stack_v2_enabled, tmp_path):
     env["DD_PROFILING_OUTPUT_PPROF"] = filename
     env["DD_PROFILING_CAPTURE_PCT"] = "1"
     env["DD_PROFILING_ENABLED"] = "1"
-    env["DD_PROFILING_STACK_V2_ENABLED"] = "1" if stack_v2_enabled else "0"
     stdout, stderr, exitcode, _ = call_program(
         "ddtrace-run",
         sys.executable,
@@ -78,17 +72,15 @@ def test_call_script_pprof_output(stack_v2_enabled, tmp_path):
     assert len(samples) > 0
 
 
-@pytest.mark.parametrize("stack_v2_enabled", [True, False])
 @pytest.mark.skipif(sys.platform == "win32", reason="fork only available on Unix")
-def test_fork(stack_v2_enabled, tmp_path):
-    if sys.version_info[:2] == (3, 7) and stack_v2_enabled:
+def test_fork(tmp_path):
+    if sys.version_info[:2] == (3, 7):
         pytest.skip("stack_v2 is not supported on Python 3.7")
 
     filename = str(tmp_path / "pprof")
     env = os.environ.copy()
     env["DD_PROFILING_OUTPUT_PPROF"] = filename
     env["DD_PROFILING_CAPTURE_PCT"] = "100"
-    env["DD_PROFILING_STACK_V2_ENABLED"] = "1" if stack_v2_enabled else "0"
     stdout, stderr, exitcode, pid = call_program(
         "python", os.path.join(os.path.dirname(__file__), "simple_program_fork.py"), env=env
     )
@@ -144,14 +136,12 @@ def test_fork(stack_v2_enabled, tmp_path):
     )
 
 
-@pytest.mark.parametrize("stack_v2_enabled", [True, False])
 @pytest.mark.skipif(sys.platform == "win32", reason="fork only available on Unix")
 @pytest.mark.skipif(not os.getenv("DD_PROFILE_TEST_GEVENT", False), reason="Not testing gevent")
-def test_fork_gevent(stack_v2_enabled):
-    if sys.version_info[:2] == (3, 7) and stack_v2_enabled:
+def test_fork_gevent():
+    if sys.version_info[:2] == (3, 7):
         pytest.skip("stack_v2 is not supported on Python 3.7")
     env = os.environ.copy()
-    env["DD_PROFILING_STACK_V2_ENABLED"] = "1" if stack_v2_enabled else "0"
     stdout, stderr, exitcode, pid = call_program(
         "python", os.path.join(os.path.dirname(__file__), "../profiling", "gevent_fork.py"), env=env
     )
@@ -161,20 +151,18 @@ def test_fork_gevent(stack_v2_enabled):
 methods = multiprocessing.get_all_start_methods()
 
 
-@pytest.mark.parametrize("stack_v2_enabled", [True, False])
 @pytest.mark.parametrize(
     "method",
     set(methods) - {"forkserver", "fork"},
 )
-def test_multiprocessing(stack_v2_enabled, method, tmp_path):
-    if sys.version_info[:2] == (3, 7) and stack_v2_enabled:
+def test_multiprocessing(method, tmp_path):
+    if sys.version_info[:2] == (3, 7):
         pytest.skip("stack_v2 is not supported on Python 3.7")
     filename = str(tmp_path / "pprof")
     env = os.environ.copy()
     env["DD_PROFILING_OUTPUT_PPROF"] = filename
     env["DD_PROFILING_ENABLED"] = "1"
     env["DD_PROFILING_CAPTURE_PCT"] = "1"
-    env["DD_PROFILING_STACK_V2_ENABLED"] = "1" if stack_v2_enabled else "0"
     stdout, stderr, exitcode, _ = call_program(
         "ddtrace-run",
         sys.executable,
@@ -208,8 +196,6 @@ def test_memalloc_no_init_error_on_fork():
     os.waitpid(pid, 0)
 
 
-# Not parametrizing with stack_v2_enabled as subprocess mark doesn't support
-# parametrized tests and this only tests our start up code.
 @pytest.mark.subprocess(
     ddtrace_run=True,
     env=dict(