Merge branch 'master' into estringana/add-openai-integration

estringana · web-flow · commit ba5e2ab57bfb · 2026-03-02T11:39:47.000+01:00
diff --git a/.gitlab/generate-appsec.php b/.gitlab/generate-appsec.php
@@ -71,7 +71,7 @@
   image: registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-${PHP_MAJOR_MINOR}_bookworm-6
   variables:
     KUBERNETES_CPU_REQUEST: 3
-    KUBERNETES_MEMORY_REQUEST: 3Gi
+    KUBERNETES_MEMORY_REQUEST: 4Gi
     KUBERNETES_MEMORY_LIMIT: 4Gi
   parallel:
     matrix:
diff --git a/.gitlab/generate-package.php b/.gitlab/generate-package.php
@@ -1397,7 +1397,11 @@
     VERSION="$(<VERSION)"
     [[ -z "${VERSION}" ]] && echo "VERSION file is empty or not present" && exit 1
     cd packages/ && aws s3 cp --recursive . "s3://dd-trace-php-builds/${VERSION}/"
-    aws s3 cp datadog-setup.php "s3://dd-trace-php-builds/latest/"
+    if [ "${CI_COMMIT_REF_NAME}" = "${CI_DEFAULT_BRANCH}" ]; then
+      aws s3 cp datadog-setup.php "s3://dd-trace-php-builds/latest/"
+    else
+      echo "Skipping latest upload for non-default branch: ${CI_COMMIT_REF_NAME} (default: ${CI_DEFAULT_BRANCH})"
+    fi
     echo "https://s3.us-east-1.amazonaws.com/dd-trace-php-builds/$(echo $VERSION | sed 's/+/%2B/')/datadog-setup.php"
   artifacts:
     paths:
diff --git a/.gitlab/generate-profiler.php b/.gitlab/generate-profiler.php
@@ -17,10 +17,18 @@
   stage: test
   tags: [ "arch:${ARCH}" ]
   image: registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:${IMAGE_PREFIX}${PHP_MAJOR_MINOR}${IMAGE_SUFFIX}
+  # Setting the *_REQUEST and *_LIMIT variables to be the same, and setting
+  # them for both the build and helper allows using Guaranteed QoS instead of
+  # Burstable. This means nproc and similar tools will work as expected.
   variables:
-    KUBERNETES_CPU_REQUEST: 5
-    KUBERNETES_MEMORY_REQUEST: 3Gi
-    KUBERNETES_MEMORY_LIMIT: 4Gi
+    KUBERNETES_CPU_REQUEST: 3
+    KUBERNETES_CPU_LIMIT: 3
+    KUBERNETES_MEMORY_REQUEST: 6Gi
+    KUBERNETES_MEMORY_LIMIT: 6Gi
+    KUBERNETES_HELPER_CPU_REQUEST: 1
+    KUBERNETES_HELPER_CPU_LIMIT: 1
+    KUBERNETES_HELPER_MEMORY_REQUEST: 2Gi
+    KUBERNETES_HELPER_MEMORY_LIMIT: 2Gi
     CARGO_TARGET_DIR: /mnt/ramdisk/cargo # ramdisk??
     libdir: /tmp/datadog-profiling
   parallel:
@@ -38,6 +46,8 @@
     - if [ -f /sbin/apk ] && [ $(uname -m) = "aarch64" ]; then ln -sf ../lib/llvm17/bin/clang /usr/bin/clang; fi
 
     - cd profiling
+    - 'echo "nproc: $(nproc)"'
+    - 'echo "KUBERNETES_CPU_REQUEST: ${KUBERNETES_CPU_REQUEST:-<unset>}"'
     - export TEST_PHP_EXECUTABLE=$(which php)
     - run_tests_php=$(find $(php-config --prefix) -name run-tests.php) # don't anticipate there being more than one
     - cp -v "${run_tests_php}" tests
diff --git a/Makefile b/Makefile
@@ -451,7 +451,7 @@ generate_cbindgen: cbindgen_binary # Regenerate components-rs/ddtrace.h componen
 
 cbindgen_binary:
 	if ! command -v cbindgen &> /dev/null; then \
-		cargo install cbindgen; \
+		cargo install cbindgen --version 0.29.0 --locked; \
 	fi
 
 EXT_DIR:=/opt/datadog-php
diff --git a/dockerfiles/ci/xfail_tests/7.0.list b/dockerfiles/ci/xfail_tests/7.0.list
@@ -347,6 +347,7 @@ ext/standard/tests/general_functions/bug35229.phpt
 ext/standard/tests/general_functions/bug73973.phpt
 ext/standard/tests/general_functions/get_included_files.phpt
 ext/standard/tests/general_functions/gettype_settype_basic.phpt
+ext/standard/tests/general_functions/phpinfo.phpt
 ext/standard/tests/general_functions/print_r_64bit.phpt
 ext/standard/tests/general_functions/strval.phpt
 ext/standard/tests/general_functions/type.phpt
diff --git a/dockerfiles/ci/xfail_tests/7.1.list b/dockerfiles/ci/xfail_tests/7.1.list
@@ -375,6 +375,7 @@ ext/standard/tests/general_functions/bug35229.phpt
 ext/standard/tests/general_functions/bug73973.phpt
 ext/standard/tests/general_functions/get_included_files.phpt
 ext/standard/tests/general_functions/gettype_settype_basic.phpt
+ext/standard/tests/general_functions/phpinfo.phpt
 ext/standard/tests/general_functions/print_r_64bit.phpt
 ext/standard/tests/general_functions/strval.phpt
 ext/standard/tests/general_functions/type.phpt
diff --git a/dockerfiles/ci/xfail_tests/7.2.list b/dockerfiles/ci/xfail_tests/7.2.list
@@ -331,6 +331,7 @@ ext/standard/tests/file/lstat_stat_variation10.phpt
 ext/standard/tests/general_functions/bug73973.phpt
 ext/standard/tests/general_functions/get_included_files.phpt
 ext/standard/tests/general_functions/gettype_settype_basic.phpt
+ext/standard/tests/general_functions/phpinfo.phpt
 ext/standard/tests/general_functions/print_r_64bit.phpt
 ext/standard/tests/general_functions/strval.phpt
 ext/standard/tests/general_functions/type.phpt
diff --git a/dockerfiles/ci/xfail_tests/7.3.list b/dockerfiles/ci/xfail_tests/7.3.list
@@ -345,6 +345,7 @@ ext/standard/tests/file/lstat_stat_variation10.phpt
 ext/standard/tests/general_functions/bug73973.phpt
 ext/standard/tests/general_functions/get_included_files.phpt
 ext/standard/tests/general_functions/gettype_settype_basic.phpt
+ext/standard/tests/general_functions/phpinfo.phpt
 ext/standard/tests/general_functions/print_r_64bit.phpt
 ext/standard/tests/general_functions/strval.phpt
 ext/standard/tests/general_functions/type.phpt
diff --git a/dockerfiles/ci/xfail_tests/7.4.list b/dockerfiles/ci/xfail_tests/7.4.list
@@ -406,6 +406,7 @@ ext/standard/tests/file/lstat_stat_variation15.phpt
 ext/standard/tests/general_functions/bug73973.phpt
 ext/standard/tests/general_functions/get_included_files.phpt
 ext/standard/tests/general_functions/gettype_settype_basic.phpt
+ext/standard/tests/general_functions/phpinfo.phpt
 ext/standard/tests/general_functions/print_r_64bit.phpt
 ext/standard/tests/general_functions/proc_open_null.phpt
 ext/standard/tests/general_functions/proc_open_redirect.phpt
diff --git a/dockerfiles/ci/xfail_tests/8.0.list b/dockerfiles/ci/xfail_tests/8.0.list
@@ -470,6 +470,7 @@ ext/standard/tests/general_functions/floatval.phpt
 ext/standard/tests/general_functions/floatval_variation1.phpt
 ext/standard/tests/general_functions/get_included_files.phpt
 ext/standard/tests/general_functions/gettype_settype_basic.phpt
+ext/standard/tests/general_functions/phpinfo.phpt
 ext/standard/tests/general_functions/print_r.phpt
 ext/standard/tests/general_functions/print_r_64bit.phpt
 ext/standard/tests/general_functions/proc_open_null.phpt
diff --git a/dockerfiles/ci/xfail_tests/8.1.list b/dockerfiles/ci/xfail_tests/8.1.list
@@ -170,6 +170,7 @@ ext/standard/tests/general_functions/floatval.phpt
 ext/standard/tests/general_functions/floatval_variation1.phpt
 ext/standard/tests/general_functions/get_included_files.phpt
 ext/standard/tests/general_functions/gettype_settype_basic.phpt
+ext/standard/tests/general_functions/phpinfo.phpt
 ext/standard/tests/general_functions/print_r.phpt
 ext/standard/tests/general_functions/print_r_64bit.phpt
 ext/standard/tests/general_functions/proc_open_null.phpt
diff --git a/dockerfiles/ci/xfail_tests/README.md b/dockerfiles/ci/xfail_tests/README.md
@@ -150,6 +150,13 @@ Such tests were skipped before and are incredibly unstable on 5. It might be a C
 
 This test was flaky until it was [fixed in PHP 7.2](https://github.com/php/php-src/commit/f4474e5).
 
+## `ext/standard/tests/general_functions/phpinfo.phpt`
+
+* Disabled on versions: `7.0 --> 8.1`.
+* Upstream fix: [Reduce regex backtracking in phpinfo.phpt](https://github.com/php/php-src/commit/c4c45da4b96889348d86828c26225d113af14d21), which is present in PHP 8.2+.
+
+This test compares very large `phpinfo()` output. With tracer-specific modules and CI environment variables enabled, the output grows and older `%A`/`%a` patterns in this test can hit pathological backtracking and fail nondeterministically.
+
 ## `ext/standard/tests/streams/proc_open_bug69900.phpt`
 
 * Disabled on versions: `7.0+`.
diff --git a/profiling/src/bindings/mod.rs b/profiling/src/bindings/mod.rs
@@ -344,6 +344,10 @@ extern "C" {
     /// until mshutdown.
     pub(crate) fn ddog_php_prof_get_memoized_config(config_id: ConfigId) -> *mut zval;
 
+    /// Returns true if the config value was explicitly set by the user (not
+    /// just the compiled-in default), false otherwise.
+    pub(crate) fn ddog_php_prof_config_is_set_by_user(config_id: ConfigId) -> bool;
+
     /// Registers the run_time_cache slot with the engine. Must be done in
     /// module init or extension startup.
     pub fn ddog_php_prof_function_run_time_cache_init(module_name: *const c_char);
diff --git a/profiling/src/config.rs b/profiling/src/config.rs
@@ -1,6 +1,7 @@
 use crate::bindings::zai_config_type::*;
 use crate::bindings::{
-    datadog_php_profiling_copy_string_view_into_zval, ddog_php_prof_get_memoized_config,
+    datadog_php_profiling_copy_string_view_into_zval, ddog_php_prof_config_is_set_by_user,
+    ddog_php_prof_get_memoized_config,
     zai_config_entry, zai_config_get_value, zai_config_minit, zai_config_name,
     zai_config_system_ini_change, zend_ini_entry, zend_long, zend_string, zend_write, zval,
     StringError, ZaiStr, IS_FALSE, IS_LONG, IS_TRUE, ZAI_CONFIG_NAME_BUFSIZ, ZEND_INI_DISPLAY_ORIG,
@@ -672,7 +673,11 @@ unsafe fn get_system_uint32(id: ConfigId, default: u32) -> u32 {
 /// This function must only be called after config has been initialized in
 /// first rinit, and before it is uninitialized in mshutdown.
 unsafe fn agent_host() -> Option<Cow<'static, str>> {
-    get_system_str(AgentHost)
+    if ddog_php_prof_config_is_set_by_user(AgentHost) {
+        get_system_str(AgentHost)
+    } else {
+        None
+    }
 }
 
 /// # Safety
@@ -724,6 +729,9 @@ pub(crate) unsafe fn tags() -> (Vec<Tag>, Option<String>) {
 /// This function must only be called after config has been initialized in
 /// first rinit, and before it is uninitialized in mshutdown.
 unsafe fn trace_agent_port() -> Option<u16> {
+    if !ddog_php_prof_config_is_set_by_user(TraceAgentPort) {
+        return None;
+    }
     let port = get_system_zend_long(TraceAgentPort).unwrap_or(0);
     if port <= 0 || port > (u16::MAX as zend_long) {
         None
diff --git a/profiling/src/php_ffi.c b/profiling/src/php_ffi.c
@@ -758,6 +758,10 @@ zval *ddog_php_prof_get_memoized_config(uint16_t config_id) {
     return &zai_config_memoized_entries[config_id].decoded_value;
 }
 
+bool ddog_php_prof_config_is_set_by_user(uint16_t config_id) {
+    return zai_config_memoized_entries[config_id].name_index != ZAI_CONFIG_ORIGIN_DEFAULT;
+}
+
 #if defined(__aarch64__) && defined(CFG_TEST)
 // dummy symbol for tests, so that they can be run without being linked into PHP
 __attribute__((weak)) zend_write_func_t zend_write;
