Merge main into Node.js agentless configuration tests

# Conflicts:
#	manifests/nodejs.yml

Author: leoromanovsky

.github/actions/get_target_branch/action.yaml

@@ -33,6 +33,7 @@ runs:
         )
         libs = result.stdout.strip().split("|")
         libs.append("agent")
+        libs.append("auto_inject")
 
         text = os.environ["INPUTS_TEXT"]
         pattern = re.compile(r"\[([^@\]]+)@([^\]]+)\]", re.IGNORECASE)

.github/workflows/ci.yml

@@ -116,11 +116,13 @@ jobs:
         # initial-delay-seconds: '300' Don't need this, as the job is executed after system tests
         polling-interval-seconds: '60'
         max-retries: '120'
-        # Ignore gitlab jobs that are not K8S_LIB* (K8s lib injection) or *DOC (docker ssi) or *DO5A (docker ssi crashtracking)
+        # Ignore gitlab jobs that are not K8S_LIB* (K8s lib injection),
+        # system_tests_run_pipeline_[0-2], *DOC (docker ssi), or *DO5A
+        # (docker ssi crashtracking).
         # https://regex101.com/r/Bo5Kpn/1
         # Also ignore the job that waits for the tests to succeed before adding
         # to the merge queue.
 
         ignored-name-patterns: |
-          dd-gitlab/(?!K8S_LIB).*$(?<!DOC)(?<!DO5A)
+          dd-gitlab/(?!(?:K8S_LIB|system_tests_run_pipeline_[0-2]$)).*$(?<!DOC)(?<!DO5A)
           devflow/merge

.github/workflows/compute-workflow-parameters.yml

@@ -172,15 +172,18 @@ jobs:
 
         library_branch = ""
         agent_branch = ""
+        auto_inject_branch = ""
 
         if branch_map_str:
             branch_map = json.loads(branch_map_str)
             library_branch = branch_map.get(library, "")
             agent_branch = branch_map.get("agent", "")
+            auto_inject_branch = branch_map.get("auto_inject", "")
 
         with open(os.environ["GITHUB_OUTPUT"], "a") as f:
             f.write(f"library_branch={library_branch}\n")
             f.write(f"agent_branch={agent_branch}\n")
+            f.write(f"auto_inject_branch={auto_inject_branch}\n")
       env:
         TARGET_BRANCH_MAP: ${{ inputs._system_tests_library_target_branch_map }}
         LIBRARY: ${{ inputs.library }}
@@ -193,6 +196,7 @@ jobs:
       env:
         LIBRARY_TARGET_BRANCH: "${{ steps.extract_branch.outputs.library_branch }}"
         AGENT_TARGET_BRANCH: "${{ steps.extract_branch.outputs.agent_branch }}"
+        AUTO_INJECT_TARGET_BRANCH: "${{ steps.extract_branch.outputs.auto_inject_branch }}"
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Upload artifact

.github/workflows/nix.yml

@@ -50,7 +50,7 @@ jobs:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
-      - uses: DeterminateSystems/nix-installer-action@ef8a148080ab6020fd15196c2084a2eea5ff2d25 # v22
+      - uses: cachix/install-nix-action@630ae543ea3a38a9a4166f03376c02c50f408342 # v31.11.0
       - name: Print python version
         run: |
           nix develop --command which python

.gitlab-ci.yml

@@ -20,8 +20,6 @@ stages:
 
 variables:
     TEST: 1
-    # TEMPORARY: rollout-control allowlist for system-tests-param LIBRARIES filter.
-    E2E_SUPPORTED_LANGUAGES: "python"
     # dd-repo-tools mirror_images.py (pinned). Used by the mirror_images_* jobs.
     MIRROR_IMAGES_URL: "https://binaries.ddbuild.io/dd-repo-tools/default/ca/385a670d8fafd57f8c3c9872823aa8dcd65b53cc/mirror_images.py"
     # Destination registry for mirrored CI images.
@@ -352,26 +350,6 @@ system_tests_param:
               elif key == 'scenarios_groups': print('export SCENARIO_GROUPS=' + shlex.quote(str(val)))
       " > set_vars.sh
       source set_vars.sh
-    - |
-      if [ "$CI_COMMIT_BRANCH" != "main" ] || [ "$CI_PIPELINE_SOURCE" = "schedule" ]; then
-        export LIBRARIES=""
-      fi
-    # TEMPORARY: filter LIBRARIES via E2E_SUPPORTED_LANGUAGES (space-separated allowlist)
-    # used to control rollout, to be removed once rollout is complete.
-    - |
-      if [ -n "${E2E_SUPPORTED_LANGUAGES:-}" ]; then
-        echo "Filtering LIBRARIES with E2E_SUPPORTED_LANGUAGES='$E2E_SUPPORTED_LANGUAGES'"
-        filtered=""
-        for lib in $LIBRARIES; do
-          for allowed in $E2E_SUPPORTED_LANGUAGES; do
-            if [ "$lib" = "$allowed" ]; then
-              filtered="${filtered:+$filtered }$lib"
-              break
-            fi
-          done
-        done
-        export LIBRARIES="$filtered"
-      fi
     - export EXCLUDED_SCENARIOS='DEBUGGER_EXPRESSION_LANGUAGE,APM_TRACING_E2E_SINGLE_SPAN,APM_TRACING_E2E_OTEL,OTEL_COLLECTOR_E2E'
     - export SYSTEM_TESTS_PUSH_TO_TEST_OPTIMIZATION=true
 

README.md

@@ -2,7 +2,7 @@
 
 Having trouble? Reach out on slack: [#apm-shared-testing](https://dd.enterprise.slack.com/archives/C025TJ4RZ8X)
 
-System-tests is a black-box testing workbench for Datadog tracer libraries. It runs the **same tests** against every tracer implementation -- Java, Node.js, Python, PHP, Ruby, C++, .NET, Go, and Rust -- so shared features stay consistent across languages.
+System-tests is a black-box testing workbench for Datadog tracer libraries. It runs the **same tests** against every tracer implementation -- Java, Node.js, Python, PHP, Ruby, C, C++, .NET, Go, and Rust -- so shared features stay consistent across languages.
 
 Key principles:
 
@@ -15,7 +15,7 @@ You need **bash**, **Docker** (20.10+), and **Python 3.12**.
 
 ```bash
 # 1. Build images for the language you want to test
-./build.sh python          # or: java, nodejs, ruby, php, dotnet, golang
+./build.sh python          # or: c, java, nodejs, ruby, php, dotnet, golang
 
 # 2. Run the tests
 ./run.sh                   # run all default tests

build.sh

@@ -3,14 +3,20 @@ set -eu
 
 ATTEMPT=${SYSTEM_TEST_BUILD_ATTEMPTS:=1}
 BUILD_TIMEOUT=${SYSTEM_TEST_BUILD_TIMEOUT:=600}  # Default 10 minutes per attempt
+TIMEOUT_COMMAND=$(command -v timeout || command -v gtimeout || true)
 
 for (( i=1; i<=$ATTEMPT; i++ ))
 do
     echo "== Run build script (attempt $i on $ATTEMPT) with timeout ${BUILD_TIMEOUT}s =="
 
     # Temporarily disable exit on error to capture the exit code
     set +e
-    timeout "$BUILD_TIMEOUT" ./utils/build/build.sh "$@"
+    if [[ -n "$TIMEOUT_COMMAND" ]]; then
+        "$TIMEOUT_COMMAND" "$BUILD_TIMEOUT" ./utils/build/build.sh "$@"
+    else
+        echo "No timeout command found; running the build without a per-attempt timeout"
+        ./utils/build/build.sh "$@"
+    fi
     exit_code=$?
     set -e
 

docs/CI/system-tests-ci.md

@@ -1,6 +1,6 @@
 ## CI Workflow: Github Actions
 
-Our System-tests repository is fully integrated with Github Actions, which helps us build, execute and report tests results automatically.
+Our System-tests repository uses GitHub Actions to build, execute, and report most test results automatically. Native C end-to-end coverage runs in GitLab CI on DinD runners.
 
 The System-tests repository contains **one main workflow**: `ci.yml`. It is triggered in these cases:
 

docs/edit/manifest.md

@@ -21,6 +21,7 @@ When executed locally, tests run against the latest version of dd-trace by defau
 Each component has its own manifest file in the `manifests/` directory.
 
 ### Library Manifests
+- `manifests/c.yml` - C library
 - `manifests/cpp.yml` - C++ library
 - `manifests/cpp_httpd.yml` - C++ Apache httpd module
 - `manifests/cpp_kong.yml` - C++ Kong module

docs/execute/binaries.md

@@ -138,9 +138,36 @@ There are three ways to run system-tests with a custom node tracer.
 ## PHP library
 
 - Place `datadog-setup.php` and `dd-library-php-[X.Y.Z+commitsha]-*-linux-gnu.tar.gz` in `/binaries` folder
-  - You can download the `.tar.gz` from the `package extension: [arm64, aarch64-unknown-linux-gnu]` (or the `amd64` if you're not on ARM) job artifacts (from the `package-trigger` sub-pipeline), from a CI run of your branch.
+  - You can download the `.tar.gz` from the `package extension: [arm64, aarch64-unknown-linux-gnu]` (or the `amd64` if you're not on ARM) job artifacts (from the `package-trigger` sub-pipeline of dd-trace-php's `gitlab.ddbuild.io`), from a CI run of your branch.
+    - **Via the browser:** open the pipeline for your branch, drill into the `package-trigger`
+      child pipeline, open the `package extension: [...]` job, and download its artifacts.
+    - **Via `glab` (for agents/CLI use):** the one-liners `glab ci artifact`/`glab job artifact`
+      only search the *top-level* pipeline's jobs, so they never find `package extension: [...]`
+      (it lives in the `package-trigger` **child** pipeline) — they just hang instead of failing
+      fast. Walk the GitLab API by hand instead (project is `DataDog/apm-reliability/dd-trace-php`,
+      project ID `355`; see [GitLab CLI setup](../ai/ai-tools-integration-guide.md#gitlab-cli-glab)).
+      These calls must target `gitlab.ddbuild.io` explicitly via `--hostname`, since `glab`'s
+      default host may point elsewhere:
+      ```bash
+      # 1. Find the top-level pipeline for your commit
+      glab api --hostname gitlab.ddbuild.io "/projects/355/pipelines?sha=<commit-sha>"
+
+      # 2. List that pipeline's trigger bridges, find package-trigger's downstream_pipeline.id
+      glab api --hostname gitlab.ddbuild.io "/projects/355/pipelines/<pipeline-id>/bridges"
+
+      # 3. Find the job's numeric id in that child pipeline (paginate with &page=N if needed)
+      glab api --hostname gitlab.ddbuild.io "/projects/355/pipelines/<child-pipeline-id>/jobs?per_page=100"
+
+      # 4. Download the job's artifacts zip (large; can take a few minutes). `--output` selects
+      # glab's own response format (json/ndjson), not a file path, so redirect stdout instead.
+      glab api --hostname gitlab.ddbuild.io "/projects/355/jobs/<job-id>/artifacts" > artifacts.zip
+
+      # 5. Pull out just the tarball you need, matching your host/container architecture
+      # (<arch> is aarch64 or x86_64, matching `uname -m` inside the PHP weblog container)
+      unzip -p artifacts.zip "packages/dd-library-php-<version>-<arch>-linux-gnu.tar.gz" \
+        > binaries/dd-library-php-<version>-<arch>-linux-gnu.tar.gz
+      ```
   - The `datadog-setup.php` can be copied from the dd-trace-php repository root.
-- Copy it in the binaries folder
 
 Then run the tests from the repo root folder:
 
@@ -155,6 +182,12 @@ Then run the tests from the repo root folder:
   ],
 ```
 
+> :note: **Keep `binaries/` clean between runs**
+> Only one PHP tarball should be present in `binaries/` at a time — a stale one left over from an earlier test causes `install_ddtrace.sh`'s "multiple dd-library-php tarballs found" error.
+> This can also happen even when `binaries/` on the host is clean: the PHP base image (`apache-mod.base.Dockerfile`, tagged e.g. `datadog/system-tests:apache-mod-8.2.base-v1`) bakes in whatever was in `binaries/` at the time it was built, and it's only rebuilt if the tag is missing locally.
+> If a stale tarball was baked into the base image, every later build adds a second tarball on top of it. Fix by removing the base image and letting it rebuild:
+> - `docker rmi datadog/system-tests:<variant>.base-v1`
+
 ## Python library
 
 Use one of the four options: