chore(rc): add process tags #15298

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

dubloom merged 36 commits into main from dubloom/process-tags-remote-config

Nov 20, 2025

ddtrace/internal/process_tags/__init__.py

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -2,7 +2,9 @@
  
    from pathlib import Path

    import re

    import sys

    from typing import List

    from typing import Optional

    from typing import Tuple

    from ddtrace.internal.logger import get_logger

    from ddtrace.internal.settings.process_tags import process_tags_config as config

    @@ -44,12 +46,12 @@ def is_allowed_char(char: str) -> str:
  
        return result.strip("_")

    def generate_process_tags() -> Optional[str]:

    def generate_process_tags() -> Tuple[Optional[str], Optional[List[str]]]:

        if not config.enabled:

            return None

            return None, None

        try:

            return ",".join(

            process_tags_list = [

                f"{key}:{normalize_tag_value(value)}"

                for key, value in sorted(

                    [

    @@ -59,10 +61,12 @@ def generate_process_tags() -> Optional[str]:
  
                        (ENTRYPOINT_TYPE_TAG, ENTRYPOINT_TYPE_SCRIPT),

                    ]

                )

            )

            ]

            process_tags = ",".join(process_tags_list)

            return process_tags, process_tags_list

        except Exception as e:

            log.debug("failed to get process_tags: %s", e)

            return None

            return None, None

    process_tags = generate_process_tags()

    process_tags, process_tags_list = generate_process_tags()

ddtrace/internal/remoteconfig/client.py

-Original file line number
+Diff line change
@@ Expand Up / @@ -21,6 +21,7 @@ @@
     import ddtrace
     from ddtrace.internal import agent
     from ddtrace.internal import gitmetadata
+    from ddtrace.internal import process_tags
     from ddtrace.internal import runtime
     from ddtrace.internal.hostname import get_hostname
     from ddtrace.internal.logger import get_logger
@@ Expand Down Expand Up / @@ -233,6 +234,10 @@ def __init__(self) -> None: @@
                 app_version=ddtrace.config.version,
                 tags=[":".join(_) for _ in tags.items()],
             )
+            if p_tags_list := process_tags.process_tags_list:
+                self._client_tracer["process_tags"] = p_tags_list
             self.cached_target_files: List[AppliedConfigType] = []
             self._products: MutableMapping[str, PubSub] = dict()
@@ Expand Down @@

tests/internal/remoteconfig/test_remoteconfig.py

-Original file line number
+Diff line change
@@ Expand Up @@
             # Restore original config
             config.service = original_service
             config.env = original_env
+    def test_remote_config_payload_not_includes_process_tags():
+        client = RemoteConfigClient()
+        payload = client._build_payload({})
+        assert "process_tags" not in payload["client"]["client_tracer"]
+    @pytest.mark.subprocess(env={"DD_EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED": "True"})
+    def test_remote_config_payload_includes_process_tags():
+        import os
+        import sys
+        from unittest.mock import patch
+        from ddtrace.internal.process_tags import ENTRYPOINT_BASEDIR_TAG
+        from ddtrace.internal.process_tags import ENTRYPOINT_NAME_TAG
+        from ddtrace.internal.process_tags import ENTRYPOINT_TYPE_SCRIPT
+        from ddtrace.internal.process_tags import ENTRYPOINT_TYPE_TAG
+        from ddtrace.internal.process_tags import ENTRYPOINT_WORKDIR_TAG
+        from ddtrace.internal.remoteconfig.client import RemoteConfigClient
+        from tests.utils import process_tag_reload
+        with (
+            patch.object(sys, "argv", ["/path/to/test_script.py"]),
+            patch.object(os, "getcwd", return_value="/path/to/workdir"),
+        ):
+            process_tag_reload()
+            client = RemoteConfigClient()
+            payload = client._build_payload({})
+            assert "process_tags" in payload["client"]["client_tracer"]
+            process_tags = payload["client"]["client_tracer"]["process_tags"]
+            assert isinstance(process_tags, list)
+            assert f"{ENTRYPOINT_BASEDIR_TAG}:to" in process_tags
+            assert f"{ENTRYPOINT_NAME_TAG}:test_script" in process_tags
+            assert f"{ENTRYPOINT_TYPE_TAG}:{ENTRYPOINT_TYPE_SCRIPT}" in process_tags
+            assert f"{ENTRYPOINT_WORKDIR_TAG}:workdir" in process_tags

tests/internal/test_process_tags.py

-Original file line number
+Diff line change
@@ Expand Up / @@ -81,10 +81,12 @@ def setUp(self): @@
             super(TestProcessTags, self).setUp()
             self._original_process_tags_enabled = config.enabled
             self._original_process_tags = process_tags.process_tags
+            self._original_process_tags_list = process_tags.process_tags_list
         def tearDown(self):
             config.enabled = self._original_process_tags_enabled
             process_tags.process_tags = self._original_process_tags
+            process_tags.process_tags_list = self._original_process_tags_list
             super().tearDown()
         @pytest.mark.snapshot
@@ Expand Down @@

tests/utils.py

Original file line number	Diff line number	Diff line change
Expand Up		@@ -1623,4 +1623,4 @@ def override_third_party_packages(packages: List[str]):


		def process_tag_reload():
		process_tags.process_tags = process_tags.generate_process_tags()
		process_tags.process_tags, process_tags.process_tags_list = process_tags.generate_process_tags()

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore(rc): add process tags #15298

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!