Merge branch 'master' into levi/stack-walk-metric

morrisonlevi · web-flow · commit aed7a13450c7 · 2026-02-03T12:42:13.000-07:00
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -8,7 +8,7 @@ variables:
   GIT_SUBMODULE_STRATEGY: recursive
   # Only clone libdatadog submodule by default
   GIT_SUBMODULE_PATHS: libdatadog
-  DOWNSTREAM_REL_BRANCH:
+  RELIABILITY_ENV_BRANCH:
     value: "master"
     description: "Run a specific datadog-reliability-env branch downstream"
   SYSTEM_TESTS_LIBRARY: php
@@ -94,3 +94,4 @@ package-trigger:
     PARENT_PIPELINE_ID: $CI_PIPELINE_ID
     GIT_SUBMODULE_PATHS: libdatadog appsec/third_party/cpp-base64 appsec/third_party/libddwaf appsec/third_party/msgpack-c
     NIGHTLY_BUILD: $NIGHTLY_BUILD
+    RELIABILITY_ENV_BRANCH: $RELIABILITY_ENV_BRANCH
diff --git a/.gitlab/generate-package.php b/.gitlab/generate-package.php
@@ -98,7 +98,7 @@
 # One pipeline job overrides
 configure_system_tests:
   variables:
-    SYSTEM_TESTS_SCENARIOS_GROUPS: "simple_onboarding,simple_onboarding_profiling,lib-injection,lib-injection-profiling,docker-ssi"
+    SYSTEM_TESTS_SCENARIOS_GROUPS: "simple_onboarding,simple_onboarding_profiling,simple_onboarding_appsec,lib-injection,lib-injection-profiling,docker-ssi"
     ALLOW_MULTIPLE_CHILD_LEVELS: "false"
 
 package-oci:
diff --git a/dockerfiles/services/request-replayer/src/index.php b/dockerfiles/services/request-replayer/src/index.php
@@ -163,6 +163,15 @@ function logRequest($message, $data = '')
     case '/v0.7/config':
         $request = file_get_contents('php://input');
         logRequest("Requested remote config", $request);
+
+        if (file_exists(REQUEST_LATEST_DUMP_FILE)) {
+            $tracesStack = json_decode(file_get_contents(REQUEST_LATEST_DUMP_FILE), true);
+        } else {
+            $tracesStack = [];
+        }
+        $tracesStack[] = ['uri' => $_SERVER['REQUEST_URI'], 'headers' => getallheaders(), 'body' => $request];
+        file_put_contents(REQUEST_LATEST_DUMP_FILE, json_encode($tracesStack));
+
         $request = json_decode($request, true);
         $recentUpdate = @filemtime(REQUEST_RC_CONFIGS_FILE) > time() - 2;
         $response = [
