fix(ci): restore RC write-mode NULL-swap; fix usleep(float) in agent-env test#3849
Draft
fix(ci): restore RC write-mode NULL-swap; fix usleep(float) in agent-env test#3849
Conversation
…nt-env test - ext/remote_config.c: revert WRITE-mode path from remote_config_writing bool back to the NULL-swap pattern. Commit 7e215d9 introduced a regression where dynamic_config_multiconfig.phpt returns default INI values (-1/"true") instead of the merged RC values (0.7/"1") on PHP 7.4. - tests/ext/request-replayer/dd_trace_agent_env.phpt: replace usleep(floor(...) * 100000) with dd_trace_internal_fn('await_agent_info', 15000). floor() returns float; PHP 8 usleep() expects int, emitting E_WARNING which run-tests.php treats as fatal, aborting the entire valgrind test pass.
🎉 All green!❄️ No new flaky tests detected 🎯 Code Coverage (details) 🔗 Commit SHA: 82ea121 | Docs | Datadog PR Page | Give us feedback! |
Benchmarks [ tracer ]Benchmark execution time: 2026-04-30 13:37:26 Comparing candidate commit 82ea121 in PR branch Found 0 performance improvements and 2 performance regressions! Performance is the same for 189 metrics, 3 unstable metrics. scenario:MessagePackSerializationBench/benchMessagePackSerialization-opcache
scenario:SamplingRuleMatchingBench/benchRegexMatching4
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Two CI fixes in one PR:
1.
ext/remote_config.c— regression from commit 7e215d9The RC WRITE-mode path was changed from temporarily NULLing
remote_config_statetosetting a
remote_config_writingbool. This broke multiconfig priority merging on PHP 7.4:dynamic_config_multiconfig.phptnow returns-1/"true"instead of"0.7"/"1"becauseINI values are never committed to PHP's INI system in the WRITE path. Reverting to the
NULL-swap pattern restores the correct behavior.
remote_config_writingis kept inext/configuration.candext/live_debugger.cwhereit was needed for live-debugger re-entrancy protection.
2.
tests/ext/request-replayer/dd_trace_agent_env.phpt:44— E_WARNING kills PHP 8.x valgrind passusleep(floor(microtime(true) - $start) * 100000)passes a `float` to `usleep()`.PHP 8 emits `E_WARNING: A non-numeric value encountered`; `run-tests.php` treats this as
fatal and aborts the entire 656-test valgrind pass, causing all `test_extension_ci` jobs
on PHP 8.x to fail. Replaced with `dd_trace_internal_fn('await_agent_info', 15000)` which
correctly waits for agent info to be ready with valgrind-safe headroom.
Test plan
test_extension_ci [7.4]—dynamic_config_multiconfig.phptpassestest_extension_ci [8.3]— valgrind pass completes without fatal E_WARNINGtest_extension_ci [8.0]— no regression