Skip to content

fix(php): profiling marker checks #7658

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
morrisonlevi wants to merge 6 commits into
base: main
Choose a base branch
from
Open

fix(php): profiling marker checks #7658

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
66a0920
fix(php): profiling marker checks
morrisonlevi Sep 4, 2026
0ad5ac5
Merge branch 'main' into levi/common-extension-2
morrisonlevi Sep 8, 2026
1107643
Merge branch 'main' into levi/common-extension-2
morrisonlevi Sep 9, 2026
ab109b3
Merge branch 'main' into levi/common-extension-2
morrisonlevi Sep 10, 2026
ae4d9e9
Merge branch 'main' into levi/common-extension-2
morrisonlevi Sep 15, 2026
3e6484d
Merge branch 'main' into levi/common-extension-2
morrisonlevi Sep 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion utils/build/docker/php/common/install_ddtrace.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,14 @@ if [ "$(printf '%s\n' "7.1" "$PHP_VERSION" | sort -V | head -n1)" = "7.1" ]; the
# Only enable profiling if the bundle actually contains a profiling extension.
# When installing from a local package that was built without profiling support,
# passing --enable-profiling causes datadog-setup.php to exit with an error.
# Older packages ship a separate "datadog-profiling[.-]*" binary; newer combined
# (tracer+profiling in one ddtrace.so) packages instead ship a per-API-version
# marker file named ".ddtrace[-zts|-debug].profiling" (see datadog-setup.php's
# $shouldInstallProfiling). Check for either so this works regardless of which
# package format is being installed.
PKG_HAS_PROFILING=0
if [ -n "${PKG:-}" ]; then
if tar -tzf "$PKG" 2>/dev/null | grep -q "datadog-profiling"; then
if tar -tzf "$PKG" 2>/dev/null | grep -q -e "datadog-profiling" -e '\.ddtrace\(-zts\|-debug\)\?\.profiling$'; then
PKG_HAS_PROFILING=1
fi
else
Expand Down
Loading