Remove action and ensure ddtrace is a depdnency of the default enviro…

…nment

.github/workflows/test-target.yml

@@ -108,10 +108,13 @@ jobs:
       DDEV_E2E_AGENT_PY2: "${{ (inputs.platform == 'windows' && inputs.agent-image-windows-py2) || inputs.agent-image-py2 }}"
       # Test results for later processing
       TEST_RESULTS_BASE_DIR: "test-results"
-      # Tracing to monitor our test suite
+      # CI Visibility configuration
       DD_ENV: "ci"
       DD_SERVICE: "${{ inputs.target }}-integrations-${{ inputs.repo }}"
       DD_TRACE_ANALYTICS_ENABLED: "true"
+      DD_CIVISIBILITY_ENABLED: "true"
+      DD_CIVISIBILITY_AGENTLESS_ENABLED: "true"
+      DD_API_KEY: "${{ secrets.DD_API_KEY }}"
       # Prefix for artifact names when using minimum base package
       MINIMUM_BASE_PACKAGE_PREFIX: "${{ inputs.minimum-base-package && 'minimum-base-package-' || '' }}"
 
@@ -227,21 +230,6 @@ jobs:
       timeout-minutes: ${{ inputs.step-timeout-minutes }}
       run: ddev ci setup ${{ inputs.target-env && format('{0}:{1}', inputs.target, inputs.target-env) || inputs.target }}
 
-    - name: Get ddtrace version from datadog_checks_base
-      # This is used to ensure that the version of ddtrace we use with the ci visibility action is the same one we have in datadog_checks_base
-      id: get-ddtrace-version
-      run: |
-        DDTRACE_VERSION=$(grep 'ddtrace==' datadog_checks_base/pyproject.toml | sed 's/.*ddtrace==\([0-9.]*\).*/\1/')
-        echo "version=$DDTRACE_VERSION" >> "$GITHUB_OUTPUT"
-
-    - name: Set up CI visibility
-      uses: datadog/test-visibility-github-action@f4b026bb8b8b53f323960cf86a849a0231ff93b9 # v2.5.0
-      with:
-        languages: python
-        api_key: "${{ secrets.DD_API_KEY }}"
-        print-github-step-summary: false
-        python-tracer-version: ${{ steps.get-ddtrace-version.outputs.version }}
-
     - name: Run Unit & Integration tests
       if: inputs.latest != true && inputs.minimum-base-package != true
       timeout-minutes: ${{ inputs.step-timeout-minutes }}

datadog_checks_base/tests/base/utils/test_agent_packages.py

@@ -28,3 +28,5 @@ def test_get_datadog_wheels():
     # Verify all package names have underscores (dashes should be converted)
     for pkg in packages:
         assert "-" not in pkg
+
+    assert False

ddev/src/ddev/plugin/external/hatch/environment_collector.py

@@ -104,6 +104,13 @@ def pip_install_command(*args):
 
     def finalize_config(self, config):
         for env_name, env_config in config.items():
+            if env_name == 'default':
+                # Always add ddtrace as a dependency for the default environment
+                # This ensures we have it available when running tests to emit CI visibility data
+                # For those integrations that already have ddtrace as a dependency, either directly
+                # or through datadog_checks_base, this will have no effect.
+                self.inject_ddtrace_dependency(env_config)
+
             is_template_env = env_name == 'default'
             is_test_env = env_config.setdefault('test-env', is_template_env)
             is_e2e_env = env_config.setdefault('e2e-env', is_template_env)
@@ -154,6 +161,19 @@ def formatter_command(self, options: str, settings_dir: str) -> str:
             f'ruff format {options} --config {settings_dir}/pyproject.toml .',
         )
 
+    def inject_ddtrace_dependency(self, env_config):
+        if not self.in_core_repo:
+            return
+
+        agent_requirements = self.root.parent / 'agent_requirements.in'
+        if not agent_requirements.exists():
+            return
+
+        for line in agent_requirements.read_text().splitlines():
+            if line.startswith('ddtrace=='):
+                env_config.setdefault('dependencies', []).append(line.strip())
+                return
+
     def ruff_settings_dir(self):
         # If the local pyproject.toml exists and has ruff configuration, use it
         local_pyproject = Path("./pyproject.toml")