Skip to content

fix(crasht): metadata correctness #3965

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

Merged
morrisonlevi merged 1 commit into from
Jun 9, 2026
Merged

fix(crasht): metadata correctness #3965

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 13 additions & 21 deletions ext/signals.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,13 +183,24 @@ const ddog_CharSlice PHP_OPCACHE_ENABLE = DDOG_CHARSLICE_C("php.opcache.enable")
// Fetches certain opcache tags and adds them with the pattern of php.opcache.*.
static void dd_crasht_add_opcache_inis(ddog_Vec_Tag *tags) {
#if PHP_VERSION_ID >= 80000
// We'll push php.opcache.enabled:0 whenever we detect we're disabled.

bool loaded = zend_get_extension("Zend OPcache");
if (UNEXPECTED(!loaded)) {
goto opcache_disabled;
}

// The CLI SAPI has an additional configuration for being enabled. This is
// INI_SYSTEM so we can check it here.
bool is_cli_sapi = strcmp("cli", sapi_module.name) == 0;
if (is_cli_sapi) {
ddog_CharSlice tag = DDOG_CHARSLICE_C("php.opcache.enable_cli");
zend_string *value = dd_crasht_find_ini_by_tag(tag);
if (EXPECTED(value)) {
bool is_enabled = zend_ini_parse_bool(value);
ddog_CharSlice val = is_enabled ? ONE : ZERO;
dd_crasht_push_tag(tags, tag, val);
}
}

// opcache.jit_buffer_size is INI_SYSTEM, so we can check it now. If it's
// zero, then JIT won't operate.
{
Expand All @@ -209,25 +220,6 @@ static void dd_crasht_add_opcache_inis(ddog_Vec_Tag *tags) {
? dd_zend_string_to_CharSlice(value)
: ZERO;
dd_crasht_push_tag(tags, tag, val);
if (UNEXPECTED(!is_positive)) {
goto opcache_disabled;
}
}
}

// The CLI SAPI has an additional configuration for being enabled. This is
// INI_SYSTEM so we can check it here.
bool is_cli_sapi = strcmp("cli", sapi_module.name) == 0;
if (is_cli_sapi) {
ddog_CharSlice tag = DDOG_CHARSLICE_C("php.opcache.enable_cli");
zend_string *value = dd_crasht_find_ini_by_tag(tag);
if (EXPECTED(value)) {
bool is_enabled = zend_ini_parse_bool(value);
ddog_CharSlice val = is_enabled ? ONE : ZERO;
dd_crasht_push_tag(tags, tag, val);
if (UNEXPECTED(!is_enabled)) {
goto opcache_disabled;
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion tests/ext/crashtracker_jit_tags.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ $rr->waitForRequest(function ($request) {
"library_version": "%s",
"family": "php",
"tags": [
"php.opcache.jit_buffer_size:32M",
"php.opcache.enable_cli:1",
"php.opcache.jit_buffer_size:32M",
"php.opcache.enable:1",
"php.opcache.jit:tracing",
%A
Expand Down
Loading