gab review

Author: dubloom

ddtrace/internal/process_tags/__init__.py

@@ -5,17 +5,17 @@
 from typing import Optional
 
 from ddtrace.internal.logger import get_logger
-from ddtrace.settings._config import config
-
-from .constants import ENTRYPOINT_BASEDIR_TAG
-from .constants import ENTRYPOINT_NAME_TAG
-from .constants import ENTRYPOINT_TYPE_SCRIPT
-from .constants import ENTRYPOINT_TYPE_TAG
-from .constants import ENTRYPOINT_WORKDIR_TAG
+from ddtrace.internal.settings._config import config
 
 
 log = get_logger(__name__)
 
+ENTRYPOINT_NAME_TAG = "entrypoint.name"
+ENTRYPOINT_WORKDIR_TAG = "entrypoint.workdir"
+ENTRYPOINT_TYPE_TAG = "entrypoint.type"
+ENTRYPOINT_TYPE_SCRIPT = "script"
+ENTRYPOINT_BASEDIR_TAG = "entrypoint.basedir"
+
 _INVALID_CHARS_PATTERN = re.compile(r"[^a-z0-9/._-]")
 _CONSECUTIVE_UNDERSCORES_PATTERN = re.compile(r"_{2,}")
 
@@ -47,10 +47,4 @@ def generate_process_tags() -> Optional[str]:
         return None
 
 
-# For test purpose
-def _process_tag_reload():
-    global process_tags
-    process_tags = generate_process_tags()
-
-
 process_tags = generate_process_tags()

ddtrace/internal/process_tags/constants.py

@@ -3,11 +3,11 @@
 import pytest
 
 from ddtrace.internal import process_tags
-from ddtrace.internal.process_tags import _process_tag_reload
 from ddtrace.internal.process_tags import normalize_tag
-from ddtrace.settings._config import config
+from ddtrace.internal.settings._config import config
 from tests.subprocesstest import run_in_subprocess
 from tests.utils import TracerTestCase
+from tests.utils import process_tag_reload
 
 
 @pytest.mark.parametrize(
@@ -50,7 +50,7 @@ def tearDown(self):
     @pytest.mark.snapshot
     def test_process_tags_deactivated(self):
         config._process_tags_enabled = False
-        _process_tag_reload()
+        process_tag_reload()
 
         with self.tracer.trace("test"):
             pass
@@ -59,7 +59,7 @@ def test_process_tags_deactivated(self):
     def test_process_tags_activated(self):
         with patch("sys.argv", ["/path/to/test_script.py"]), patch("os.getcwd", return_value="/path/to/workdir"):
             config._process_tags_enabled = True
-            _process_tag_reload()
+            process_tag_reload()
 
             with self.tracer.trace("parent"):
                 with self.tracer.trace("child"):
@@ -69,7 +69,7 @@ def test_process_tags_activated(self):
     def test_process_tags_edge_case(self):
         with patch("sys.argv", ["/test_script"]), patch("os.getcwd", return_value="/path/to/workdir"):
             config._process_tags_enabled = True
-            _process_tag_reload()
+            process_tag_reload()
 
             with self.tracer.trace("span"):
                 pass
@@ -81,7 +81,7 @@ def test_process_tags_error(self):
 
             with self.override_global_config(dict(_telemetry_enabled=False)):
                 with patch("ddtrace.internal.process_tags.log") as mock_log:
-                    _process_tag_reload()
+                    process_tag_reload()
 
                     with self.tracer.trace("span"):
                         pass
@@ -96,7 +96,7 @@ def test_process_tags_error(self):
     def test_process_tags_partial_flush(self):
         with patch("sys.argv", ["/path/to/test_script.py"]), patch("os.getcwd", return_value="/path/to/workdir"):
             config._process_tags_enabled = True
-            _process_tag_reload()
+            process_tag_reload()
 
             with self.override_global_config(dict(_partial_flush_enabled=True, _partial_flush_min_spans=2)):
                 with self.tracer.trace("parent"):

tests/internal/test_process_tags.py

@@ -29,6 +29,7 @@
 from ddtrace.constants import _SPAN_MEASURED_KEY
 from ddtrace.ext import http
 from ddtrace.internal import core
+from ddtrace.internal import process_tags
 from ddtrace.internal.ci_visibility.writer import CIVisibilityWriter
 from ddtrace.internal.constants import HIGHER_ORDER_TRACE_ID_BITS
 from ddtrace.internal.encoding import JSONEncoder
@@ -1615,3 +1616,7 @@ def override_third_party_packages(packages: List[str]):
 
         filename_to_package.cache_clear()
         is_third_party.cache_clear()
+
+
+def process_tag_reload():
+    process_tags.process_tags = process_tags.generate_process_tags()