fix(pytest): fix DD_CIVISIBILITY_AGENTLESS_URL behavior (#5654)

This change fixes a bug causing the `DD_CIVISIBILITY_AGENTLESS_URL`
environment variable to be ignored.

Co-authored-by: Yun Kim <[email protected]>

Author: emmettbutler

ddtrace/internal/ci_visibility/recorder.py

@@ -23,7 +23,6 @@
 from ddtrace.settings import IntegrationConfig
 
 from .. import agent
-from .constants import AGENTLESS_BASE_URL
 from .constants import AGENTLESS_DEFAULT_SITE
 from .constants import EVP_PROXY_AGENT_BASE_PATH
 from .constants import EVP_SUBDOMAIN_HEADER_NAME
@@ -138,7 +137,6 @@ def _configure_writer(self):
             headers = {"dd-api-key": self._api_key}
             if headers["dd-api-key"]:
                 writer = CIVisibilityWriter(
-                    intake_url="%s.%s" % (AGENTLESS_BASE_URL, self._dd_site),
                     headers=headers,
                 )
             else:

ddtrace/internal/ci_visibility/writer.py

@@ -1,3 +1,4 @@
+import os
 from typing import Dict
 from typing import Optional
 
@@ -62,11 +63,10 @@ def __init__(
         headers=None,  # type: Optional[Dict[str, str]]
         use_evp=False,  # type: bool
     ):
+        if config._ci_visibility_agentless_url:
+            intake_url = config._ci_visibility_agentless_url
         if not intake_url:
-            if config._ci_visibility_agentless_url:
-                intake_url = config._ci_visibility_agentless_url
-            else:
-                intake_url = "%s.%s" % (AGENTLESS_BASE_URL, AGENTLESS_DEFAULT_SITE)
+            intake_url = "%s.%s" % (AGENTLESS_BASE_URL, os.getenv("DD_SITE", AGENTLESS_DEFAULT_SITE))
 
         client = CIVisibilityProxiedEventClient() if use_evp else CIVisibilityAgentlessEventClient()
 

tests/ci_visibility/test_ci_visibility.py

@@ -129,7 +129,15 @@ def test_civisibilitywriter_agentless_url():
 
 
 def test_civisibilitywriter_agentless_url_envvar():
-    with override_env(dict(DD_API_KEY="foobar.baz", DD_CIVISIBILITY_AGENTLESS_URL="https://foo.bar")):
+    with override_env(
+        dict(
+            DD_API_KEY="foobar.baz",
+            DD_CIVISIBILITY_AGENTLESS_URL="https://foo.bar",
+            DD_CIVISIBILITY_AGENTLESS_ENABLED="1",
+        )
+    ):
         ddtrace.internal.ci_visibility.writer.config = ddtrace.settings.Config()
-        dummy_writer = DummyCIVisibilityWriter()
-        assert dummy_writer.intake_url == "https://foo.bar"
+        ddtrace.internal.ci_visibility.recorder.ddconfig = ddtrace.settings.Config()
+        CIVisibility.enable()
+        assert CIVisibility._instance.tracer._writer.intake_url == "https://foo.bar"
+        CIVisibility.disable()