fix(profiling): issues when preloading and non-root php-fpm user are used #1975
Conversation
This file contains 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
morrisonlevi
added
🐛 bug
morrisonlevi
changed the title
morrisonlevi
force-pushed
the
levi/preload
branch
2 times, most recently
from
e45fc33 to
7197b03
Compare
morrisonlevi
force-pushed
the
levi/preload
branch
from
7197b03 to
ab487d2
Compare
bwoebi
reviewed
Mar 17, 2023
bwoebi
reviewed
Mar 17, 2023
It's not required by the PHP lifecycle model, and Bob prefers it to be not atomic if not required.
style: prefer INI over ENV
realFlowControl
approved these changes
Mar 22, 2023
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
Fixes #1919. An issue occurred when preloading and a non-root user for php-fpm were combined, and eventually php-fpm would hang when the Profiler's channels were full. The full channel was worked around in a previous commit that landed in dd-trace-php v0.85.0, but this PR addresses the core issue so that profiles will actually get sent. Sampling will no longer occur when preloading is happening.
This adds a
CFG_PRELOADdefine for C andcfg(php_preload)for Rust, which match. They are made by thebuild.rsscript, and are based on PHP version (PHP 7.4+ has preloading).Bumps the profiling version to v0.15.0.
In CI, this changes the
cargo buildandcargo testtype of jobs to use devtoolset-7 if it's present. This was required in a previous version of the PR which usedstdatomic.h, but the newer toolchain is likely preferred anyway, so I've kept it even though it's no longer required.Readiness checklist
Reviewer checklist