chore(profiling): merge profiling tests

mypy.ini

@@ -17,16 +17,16 @@ ignore_errors = true
 [mypy-ddtrace.vendor.*]
 ignore_errors = true
 
-[mypy-tests.profiling.collector.pprof_3_pb2]
+[mypy-tests.profiling_v2.collector.pprof_3_pb2]
 ignore_errors = true
 
-[mypy-tests.profiling.collector.pprof_312_pb2]
+[mypy-tests.profiling_v2.collector.pprof_312_pb2]
 ignore_errors = true
 
-[mypy-tests.profiling.collector.pprof_319_pb2]
+[mypy-tests.profiling_v2.collector.pprof_319_pb2]
 ignore_errors = true
 
-[mypy-tests.profiling.collector.pprof_421_pb2]
+[mypy-tests.profiling_v2.collector.pprof_421_pb2]
 ignore_errors = true
 
 [mypy-ddtrace.internal.datadog.profiling.ddup]

pyproject.toml

@@ -136,7 +136,7 @@ exclude = '''
   | build/
   | dist/
   | tests/lib-injection/dd-lib-python-init-test-protobuf-old/addressbook_pb2.py$
-  | tests/profiling/collector/pprof_.*_pb2.py$
+  | tests/profiling_v2/collector/pprof_.*_pb2.py$
 )
 '''
 
@@ -186,8 +186,7 @@ exclude = [
     "ddtrace/__init__.py",
     "ddtrace/vendor/*",
     "ddtrace/appsec/_iast/_taint_tracking/_vendor/*",
-    "tests/profiling/collector/pprof_*pb2.py",
-    "tests/profiling/simple_program_gevent.py",
+    "tests/profiling_v2/collector/pprof_*pb2.py",
     "tests/contrib/grpc/hello_pb2.py",
     "tests/contrib/django_celery/app/*",
     "tests/contrib/protobuf/schemas/**/*.py",

riotfile.py

@@ -3225,7 +3225,7 @@ def select_pys(min_version: str = MIN_PYTHON_VERSION, max_version: str = MAX_PYT
         Venv(
             name="profile-v2",
             # NB riot commands that use this Venv must include --pass-env to work properly
-            command="python -m tests.profiling.run pytest -v --no-cov --capture=no --benchmark-disable --ignore='tests/profiling_v2/collector/test_memalloc.py' {cmdargs} tests/profiling_v2",  # noqa: E501
+            command="python -m tests.profiling_v2.run pytest -v --no-cov --capture=no --benchmark-disable --ignore='tests/profiling_v2/collector/test_memalloc.py' {cmdargs} tests/profiling_v2",  # noqa: E501
             env={
                 "DD_PROFILING_ENABLE_ASSERTS": "1",
                 "CPUCOUNT": "12",
@@ -3248,7 +3248,7 @@ def select_pys(min_version: str = MIN_PYTHON_VERSION, max_version: str = MAX_PYT
             venvs=[
                 Venv(
                     name="profile-v2-uwsgi",
-                    command="python -m tests.profiling.run pytest -v --no-cov --capture=no --benchmark-disable {cmdargs} tests/profiling_v2/test_uwsgi.py",  # noqa: E501
+                    command="python -m tests.profiling_v2.run pytest -v --no-cov --capture=no --benchmark-disable {cmdargs} tests/profiling_v2/test_uwsgi.py",  # noqa: E501
                     pys=select_pys(max_version="3.13"),
                     pkgs={
                         "uwsgi": "<2.0.30",
@@ -3366,7 +3366,7 @@ def select_pys(min_version: str = MIN_PYTHON_VERSION, max_version: str = MAX_PYT
                 ),
                 Venv(
                     name="profile-v2-memalloc",
-                    command="python -m tests.profiling.run pytest -v --no-cov --capture=no --benchmark-disable {cmdargs} tests/profiling_v2/collector/test_memalloc.py",  # noqa: E501
+                    command="python -m tests.profiling_v2.run pytest -v --no-cov --capture=no --benchmark-disable {cmdargs} tests/profiling_v2/collector/test_memalloc.py",  # noqa: E501
                     # skipping v3.14 for now due to an unstable `lz4 ` lib issue: https://gitlab.ddbuild.io/DataDog/apm-reliability/dd-trace-py/-/jobs/1163312347
                     pys=select_pys(max_version="3.13"),
                     pkgs={

scripts/check_suitespec_coverage.py

@@ -24,10 +24,6 @@
 
 # Ignore any embedded documentation
 IGNORE_PATTERNS.add("**/*.md")
-# TODO(taegyunkim): remove these after merging profiling v2 tests back to profiling
-IGNORE_PATTERNS.add("tests/profiling/*.py")
-IGNORE_PATTERNS.add("tests/profiling/*/*.py")
-IGNORE_PATTERNS.add("tests/profiling/*/*.proto")
 
 
 def owners(path: str) -> str:

scripts/needs_testrun.py

@@ -151,7 +151,7 @@ def needs_testrun(suite: str, pr_number: int, sha: t.Optional[str] = None) -> bo
     ...     needs_testrun("debugger", 6485)
     ...     needs_testrun("debugger", 6388)
     ...     needs_testrun("foobar", 6412)
-    ...     needs_testrun("profiling::profile_v2", 11690)
+    ...     needs_testrun("profiling_v2::profile_v2", 11690)
     True
     True
     True

sgconfig.yml

@@ -58,7 +58,7 @@ ignoreFiles:
   - test-results/**/*
 
   # Generated protobuf files
-  - "tests/profiling/collector/pprof_*pb2.py"
+  - "tests/profiling_v2/collector/pprof_*pb2.py"
   - "tests/contrib/grpc/hello_pb2.py"
   - "tests/lib-injection/dd-lib-python-init-test-protobuf-old/addressbook_pb2.py"