Skip to content

Commit dbcdc56

Browse files
committed
remove profiling_v2
1 parent 6afa0da commit dbcdc56

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+62
-64
lines changed

.github/CODEOWNERS

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,6 @@ ddtrace/profiling @DataDog/profiling-python
137137
ddtrace/internal/settings/profiling.py @DataDog/profiling-python
138138
ddtrace/internal/datadog/profiling @DataDog/profiling-python
139139
tests/profiling @DataDog/profiling-python
140-
tests/profiling_v2 @DataDog/profiling-python
141140
.gitlab/tests/profiling.yml @DataDog/profiling-python
142141

143142
# MLObs

hatch.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ DD_PROFILING_PYTORCH_ENABLED = "true"
159159
test = [
160160
"uname -a",
161161
"pip freeze",
162-
"python -m pytest tests/profiling_v2/test_pytorch.py -vvv --capture=tee-sys",
162+
"python -m pytest tests/profiling/test_pytorch.py -vvv --capture=tee-sys",
163163
]
164164

165165
[[envs.profiling_pytorch.matrix]]

mypy.ini

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@ ignore_errors = true
1717
[mypy-ddtrace.vendor.*]
1818
ignore_errors = true
1919

20-
[mypy-tests.profiling_v2.collector.pprof_3_pb2]
20+
[mypy-tests.profiling.collector.pprof_3_pb2]
2121
ignore_errors = true
2222

23-
[mypy-tests.profiling_v2.collector.pprof_312_pb2]
23+
[mypy-tests.profiling.collector.pprof_312_pb2]
2424
ignore_errors = true
2525

26-
[mypy-tests.profiling_v2.collector.pprof_319_pb2]
26+
[mypy-tests.profiling.collector.pprof_319_pb2]
2727
ignore_errors = true
2828

29-
[mypy-tests.profiling_v2.collector.pprof_421_pb2]
29+
[mypy-tests.profiling.collector.pprof_421_pb2]
3030
ignore_errors = true
3131

3232
[mypy-ddtrace.internal.datadog.profiling.ddup]

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ exclude = '''
136136
| build/
137137
| dist/
138138
| tests/lib-injection/dd-lib-python-init-test-protobuf-old/addressbook_pb2.py$
139-
| tests/profiling_v2/collector/pprof_.*_pb2.py$
139+
| tests/profiling/collector/pprof_.*_pb2.py$
140140
)
141141
'''
142142

@@ -186,7 +186,7 @@ exclude = [
186186
"ddtrace/__init__.py",
187187
"ddtrace/vendor/*",
188188
"ddtrace/appsec/_iast/_taint_tracking/_vendor/*",
189-
"tests/profiling_v2/collector/pprof_*pb2.py",
189+
"tests/profiling/collector/pprof_*pb2.py",
190190
"tests/contrib/grpc/hello_pb2.py",
191191
"tests/contrib/django_celery/app/*",
192192
"tests/contrib/protobuf/schemas/**/*.py",

riotfile.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3235,7 +3235,7 @@ def select_pys(min_version: str = MIN_PYTHON_VERSION, max_version: str = MAX_PYT
32353235
Venv(
32363236
name="profile-v2",
32373237
# NB riot commands that use this Venv must include --pass-env to work properly
3238-
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
3238+
command="python -m tests.profiling.run pytest -v --no-cov --capture=no --benchmark-disable --ignore='tests/profiling/collector/test_memalloc.py' {cmdargs} tests/profiling", # noqa: E501
32393239
env={
32403240
"DD_PROFILING_ENABLE_ASSERTS": "1",
32413241
"CPUCOUNT": "12",
@@ -3258,7 +3258,7 @@ def select_pys(min_version: str = MIN_PYTHON_VERSION, max_version: str = MAX_PYT
32583258
venvs=[
32593259
Venv(
32603260
name="profile-v2-uwsgi",
3261-
command="python -m tests.profiling_v2.run pytest -v --no-cov --capture=no --benchmark-disable {cmdargs} tests/profiling_v2/test_uwsgi.py", # noqa: E501
3261+
command="python -m tests.profiling.run pytest -v --no-cov --capture=no --benchmark-disable {cmdargs} tests/profiling/test_uwsgi.py", # noqa: E501
32623262
pys=select_pys(max_version="3.13"),
32633263
pkgs={
32643264
"uwsgi": "<2.0.30",
@@ -3376,7 +3376,7 @@ def select_pys(min_version: str = MIN_PYTHON_VERSION, max_version: str = MAX_PYT
33763376
),
33773377
Venv(
33783378
name="profile-v2-memalloc",
3379-
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
3379+
command="python -m tests.profiling.run pytest -v --no-cov --capture=no --benchmark-disable {cmdargs} tests/profiling/collector/test_memalloc.py", # noqa: E501
33803380
# skipping v3.14 for now due to an unstable `lz4 ` lib issue: https://gitlab.ddbuild.io/DataDog/apm-reliability/dd-trace-py/-/jobs/1163312347
33813381
pys=select_pys(max_version="3.13"),
33823382
pkgs={

scripts/needs_testrun.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ def needs_testrun(suite: str, pr_number: int, sha: t.Optional[str] = None) -> bo
151151
... needs_testrun("debugger", 6485)
152152
... needs_testrun("debugger", 6388)
153153
... needs_testrun("foobar", 6412)
154-
... needs_testrun("profiling_v2::profile_v2", 11690)
154+
... needs_testrun("profiling::profile_v2", 11690)
155155
True
156156
True
157157
True

sgconfig.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ ignoreFiles:
5858
- test-results/**/*
5959

6060
# Generated protobuf files
61-
- "tests/profiling_v2/collector/pprof_*pb2.py"
61+
- "tests/profiling/collector/pprof_*pb2.py"
6262
- "tests/contrib/grpc/hello_pb2.py"
6363
- "tests/lib-injection/dd-lib-python-init-test-protobuf-old/addressbook_pb2.py"
6464

tests/README.md

Lines changed: 0 additions & 1 deletion
File renamed without changes.

0 commit comments

Comments
 (0)