Fix failing appsec tests on pipeline (#2874)

estringana · Anilm3 · web-flow · commit c1fd94c76d18 · 2024-10-04T20:45:27.000+01:00
Co-authored-by: Anil Mahtani &lt;929854+Anilm3@users.noreply.github.com&gt;
diff --git a/.circleci/continue_config.yml b/.circleci/continue_config.yml
@@ -1411,7 +1411,9 @@ jobs:
           command: |
             export DEBIAN_FRONTEND=noninteractive
             apt update
-            apt install -y wget sudo git g++ gcc gcovr cmake make curl libcurl4-gnutls-dev clang clang-tidy clang-format git php-dev php8.2-xml php-cgi cargo
+            apt install -y wget sudo git g++ gcc gcovr cmake make curl libcurl4-gnutls-dev clang clang-tidy clang-format git php-dev php8.2-xml php-cgi
+            curl https://sh.rustup.rs -sSf | sh -s -- --profile minimal -y --default-toolchain "1.76.0"
+            echo 'export PATH=${PATH}:$HOME/.cargo/bin' >> $BASH_ENV
       - run: git config --global --add safe.directory /home/circleci/datadog/appsec/third_party/libddwaf
       - run:
           name: CMake
diff --git a/appsec/src/extension/helper_process.c b/appsec/src/extension/helper_process.c
@@ -129,8 +129,10 @@ dd_conn *nullable dd_helper_mgr_cur_conn(void)
     return NULL;
 }
 
-// NOLINTNEXTLINE(bugprone-easily-swappable-parameters)
-bool dd_on_runtime_path_update(zval *nullable old_val, zval *nonnull new_val, zend_string *nonnull new_str)
+bool dd_on_runtime_path_update(
+    // NOLINTNEXTLINE(bugprone-easily-swappable-parameters)
+    zval *nullable old_val, zval *nonnull new_val,
+    zend_string *nullable new_str)
 {
     UNUSED(old_val);
     UNUSED(new_str);
diff --git a/appsec/src/extension/helper_process.h b/appsec/src/extension/helper_process.h
@@ -27,7 +27,8 @@ dd_conn *nullable dd_helper_mgr_acquire_conn(client_init_func nonnull, void *uns
 dd_conn *nullable dd_helper_mgr_cur_conn(void);
 void dd_helper_close_conn(void);
 
-bool dd_on_runtime_path_update(
-    zval *nullable old_value, zval *nonnull new_value, zend_string *nonnull new_str);
+// NOLINTNEXTLINE(bugprone-easily-swappable-parameters)
+bool dd_on_runtime_path_update(zval *nullable old_value,
+    zval *nonnull new_value, zend_string *nullable new_str);
 
 #endif // DD_HELPER_MGR_H
diff --git a/appsec/tests/extension/report_backtrace_01.phpt b/appsec/tests/extension/report_backtrace_01.phpt
@@ -2,6 +2,7 @@
 Report backtrace
 --ENV--
 DD_TRACE_GENERATE_ROOT_SPAN=0
+DD_TRACE_AUTO_FLUSH_ENABLED=0
 --INI--
 extension=ddtrace.so
 --FILE--
diff --git a/appsec/tests/extension/report_backtrace_05.phpt b/appsec/tests/extension/report_backtrace_05.phpt
@@ -2,6 +2,7 @@
 Trace are reported when helper indicates so
 --ENV--
 DD_TRACE_GENERATE_ROOT_SPAN=0
+DD_TRACE_AUTO_FLUSH_ENABLED=0
 --INI--
 extension=ddtrace.so
 datadog.appsec.enabled=1
diff --git a/appsec/tests/extension/root_span_add_tag.phpt b/appsec/tests/extension/root_span_add_tag.phpt
@@ -2,6 +2,7 @@
 Test ddtrace_root_span_add_tag
 --ENV--
 DD_TRACE_GENERATE_ROOT_SPAN=0
+DD_TRACE_AUTO_FLUSH_ENABLED=0
 DD_SERVICE=appsec_tests
 --INI--
 extension=ddtrace.so

Original file line number	Diff line number	Diff line change
`@@ -129,8 +129,10 @@ dd_conn *nullable dd_helper_mgr_cur_conn(void)`
`129`	`129`	`return NULL;`
`130`	`130`	`}`
`131`	`131`
`132`		`-// NOLINTNEXTLINE(bugprone-easily-swappable-parameters)`
`133`		`-bool dd_on_runtime_path_update(zval nullable old_val, zval nonnull new_val, zend_string *nonnull new_str)`
	`132`	`+bool dd_on_runtime_path_update(`
	`133`	`+ // NOLINTNEXTLINE(bugprone-easily-swappable-parameters)`
	`134`	`+ zval nullable old_val, zval nonnull new_val,`
	`135`	`+ zend_string *nullable new_str)`
`134`	`136`	`{`
`135`	`137`	`UNUSED(old_val);`
`136`	`138`	`UNUSED(new_str);`