|
6 | 6 |
|
7 | 7 | import ddtrace |
8 | 8 | from ddtrace.internal.constants import DEFAULT_SERVICE_NAME |
9 | | -from ddtrace.internal.process_tags import _process_tag_reload |
10 | 9 | from ddtrace.internal.runtime.container import CGroupInfo |
11 | 10 | from ddtrace.internal.telemetry.data import _format_version_info |
12 | 11 | from ddtrace.internal.telemetry.data import _get_container_id |
13 | 12 | from ddtrace.internal.telemetry.data import _get_os_version |
14 | 13 | from ddtrace.internal.telemetry.data import get_application |
15 | 14 | from ddtrace.internal.telemetry.data import get_host_info |
16 | 15 | from ddtrace.internal.telemetry.data import get_hostname |
| 16 | +from tests.utils import process_tag_reload |
17 | 17 |
|
18 | 18 |
|
19 | 19 | def test_get_application(): |
@@ -45,33 +45,17 @@ def test_get_application_with_values(): |
45 | 45 |
|
46 | 46 |
|
47 | 47 | def test_get_application_with_process_tags(): |
48 | | - from ddtrace.internal.process_tags.constants import ENTRYPOINT_BASEDIR_TAG |
49 | | - from ddtrace.internal.process_tags.constants import ENTRYPOINT_NAME_TAG |
50 | | - from ddtrace.internal.process_tags.constants import ENTRYPOINT_TYPE_SCRIPT |
51 | | - from ddtrace.internal.process_tags.constants import ENTRYPOINT_TYPE_TAG |
52 | | - from ddtrace.internal.process_tags.constants import ENTRYPOINT_WORKDIR_TAG |
53 | | - from ddtrace.settings._config import config |
54 | | - |
55 | | - with mock.patch("sys.argv", ["/path/to/test_script.py"]), mock.patch("os.getcwd", return_value="/path/to/workdir"): |
56 | | - try: |
57 | | - config._process_tags_enabled = True |
58 | | - _process_tag_reload() |
59 | | - |
60 | | - application = get_application("", "", "") |
61 | | - assert "process_tags" in application |
62 | | - |
63 | | - process_tags = application["process_tags"] |
64 | | - |
65 | | - expected_raw = ( |
66 | | - f"{ENTRYPOINT_BASEDIR_TAG}:to," |
67 | | - f"{ENTRYPOINT_NAME_TAG}:test_script," |
68 | | - f"{ENTRYPOINT_TYPE_TAG}:{ENTRYPOINT_TYPE_SCRIPT}," |
69 | | - f"{ENTRYPOINT_WORKDIR_TAG}:workdir" |
70 | | - ) |
71 | | - assert process_tags == expected_raw |
72 | | - finally: |
73 | | - config._process_tags_enabled = False |
74 | | - _process_tag_reload() |
| 48 | + from ddtrace.internal.settings._config import config |
| 49 | + |
| 50 | + try: |
| 51 | + config._process_tags_enabled = True |
| 52 | + process_tag_reload() |
| 53 | + |
| 54 | + application = get_application("", "", "") |
| 55 | + assert "process_tags" in application |
| 56 | + finally: |
| 57 | + config._process_tags_enabled = False |
| 58 | + process_tag_reload() |
75 | 59 |
|
76 | 60 |
|
77 | 61 | def test_application_with_setenv(run_python_code_in_subprocess, monkeypatch): |
|
0 commit comments