Merge branch 'master' into florian/profiler-debug

realFlowControl · web-flow · commit fdc38bdfcfef · 2026-05-26T14:58:36.000+02:00
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -45,6 +45,9 @@ generate-templates:
       elif [ "${CI_COMMIT_BRANCH:-}" = "bot/libdatadog-latest" ]; then
         # Feedback run after a bot commit: the submodule already points to the tested SHA.
         # Don't export — generate-common.php must not inject fetch/checkout (no-op anyway).
+        set -x
+        apt update
+        apt install -y git
         LIBDATADOG_SHA=$(git ls-tree HEAD libdatadog | awk '{print $3}')
         printf 'LIBDATADOG_OVERRIDE_SHA=%s\nLIBDATADOG_FEEDBACK_RUN=true\n' "$LIBDATADOG_SHA" >> libdatadog.env
       fi
diff --git a/.gitlab/generate-common.php b/.gitlab/generate-common.php
@@ -114,6 +114,7 @@ function windows_git_setup_with_packages() {
     }
 
     $step  = <<<STEP
+    - git config --global --add safe.directory "\${CI_PROJECT_DIR}/libdatadog"
     - git -C libdatadog fetch --depth=1 origin "$_libdatadog_sha" 2>&1
     - git -C libdatadog checkout FETCH_HEAD
 STEP;
diff --git a/.gitlab/libdatadog-latest.yml b/.gitlab/libdatadog-latest.yml
@@ -211,10 +211,10 @@ stages:
         # Install Claude (nvm — no root required)
         if ! command -v claude &>/dev/null; then
           export NVM_DIR="${HOME}/.nvm"
-          curl -fsSL https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash - 2>&1
-          . "${NVM_DIR}/nvm.sh"
-          nvm install --lts --no-progress 2>&1
-          npm install -g @anthropic-ai/claude-code 2>&1
+          curl -fsSL https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash - >/dev/null 2>&1
+          . "${NVM_DIR}/nvm.sh" >/dev/null 2>&1
+          nvm install --lts --no-progress >/dev/null 2>&1
+          npm install -g @anthropic-ai/claude-code >/dev/null 2>&1
         fi
 
         AI_GATEWAY_TOKEN=$(_vault_jwt rapid-ai-platform) || {
diff --git a/ext/engine_hooks.c b/ext/engine_hooks.c
@@ -77,7 +77,7 @@ static zend_op_array *_dd_compile_file(zend_file_handle *file_handle, int type)
     zend_op_array *res;
     uint64_t start = zend_hrtime();
     res = _prev_compile_file(file_handle, type);
-    DDTRACE_G(compile_time_microseconds) += (int64_t)(zend_hrtime() - start);
+    DDTRACE_G(compile_time_microseconds) += (int64_t)((zend_hrtime() - start) / 1000);
     return res;
 }
 
diff --git a/zend_abstract_interface/config/config_ini.c b/zend_abstract_interface/config/config_ini.c
@@ -396,7 +396,7 @@ void zai_config_ini_rinit(void) {
 
 #if ZTS
     // Skip during preloading, in that case EG(ini_directives) is the actual source of truth (NTS-like)
-    if (env_to_ini_name && !inis_synchronized && zai_config_first_rinit_done) {
+    if (env_to_ini_name && !inis_synchronized && zai_config_first_rinit_done && !in_startup) {
         for (uint16_t i = 0; i < zai_config_memoized_entries_count; ++i) {
             zai_config_memoized_entry *memoized = &zai_config_memoized_entries[i];
             if (!memoized->original_on_modify) {
@@ -405,6 +405,8 @@ void zai_config_ini_rinit(void) {
                     zend_ini_entry *source = memoized->ini_entries[n],
                                    *ini = zend_hash_find_ptr(EG(ini_directives), source->name);
                     // On ZTS INIs must be not shared between threads (otherwise: refcount race conditions). Hence we dup them rather than just copy.
+                    ZEND_ASSERT(ini && source);
+                    ZEND_ASSERT(ini != source && "ZTS INI sync must not run against the global INI table");
                     if (ini->modified) {
                         bool identical_orig = ini->orig_value == ini->value;
                         zend_string_release(ini->orig_value);

Original file line number	Diff line number	Diff line change
`@@ -114,6 +114,7 @@ function windows_git_setup_with_packages() {`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`$step = <<<STEP`
	`117`	`+ - git config --global --add safe.directory "\${CI_PROJECT_DIR}/libdatadog"`
`117`	`118`	`- git -C libdatadog fetch --depth=1 origin "$_libdatadog_sha" 2>&1`
`118`	`119`	`- git -C libdatadog checkout FETCH_HEAD`
`119`	`120`	`STEP;`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ static zend_op_array _dd_compile_file(zend_file_handle file_handle, int type)`
`77`	`77`	`zend_op_array *res;`
`78`	`78`	`uint64_t start = zend_hrtime();`
`79`	`79`	`res = _prev_compile_file(file_handle, type);`
`80`		`- DDTRACE_G(compile_time_microseconds) += (int64_t)(zend_hrtime() - start);`
	`80`	`+ DDTRACE_G(compile_time_microseconds) += (int64_t)((zend_hrtime() - start) / 1000);`
`81`	`81`	`return res;`
`82`	`82`	`}`
`83`	`83`