Skip to content

fix(agent): only try to add exception if it exists #1235

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
zsistla wants to merge 4 commits into
base: feat/fibers
Choose a base branch
from
Open

fix(agent): only try to add exception if it exists #1235

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
534d8c8
fix(agent): only try to add exception if it exists
zsistla Jun 12, 2026
d8c6c7c
Merge branch 'feat/fibers' into fibers/on_null_returnval
zsistla Jun 23, 2026
3aca3c1
Merge branch 'feat/fibers' into fibers/on_null_returnval
zsistla Jun 24, 2026
53b9a48
Merge branch 'feat/fibers' into fibers/on_null_returnval
zsistla Jun 26, 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
18 changes: 10 additions & 8 deletions agent/php_execute.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2030,18 +2030,20 @@ static void nr_php_instrument_func_end(NR_EXECUTE_PROTO) {
"Uncaught exception ", &NRPRG_SHARED(exception_filters) TSRMLS_CC);
} else if (NULL == nr_php_get_return_value(NR_EXECUTE_ORIG_ARGS)) {
/*
* Having no return value (and not being an exception handler) indicates
* Having no return value (and not being an exception handler) could indicate
* that this segment had an uncaught exception. We want to add that
* exception to the segment.
*/
zval exception;
ZVAL_OBJ(&exception, EG(exception));
nr_status_t status = nr_php_error_record_exception_segment(
NRPRG(txn), &exception, &NRPRG_SHARED(exception_filters));

if (NR_FAILURE == status) {
nrl_verbosedebug(NRL_AGENT, "%s: unable to record exception on segment",
__func__);
if (NULL != EG(exception)) {
ZVAL_OBJ(&exception, EG(exception));
nr_status_t status = nr_php_error_record_exception_segment(
NRPRG(txn), &exception, &NRPRG_SHARED(exception_filters));

if (NR_FAILURE == status) {
nrl_verbosedebug(NRL_AGENT, "%s: unable to record exception on segment",
__func__);
}
}
}

Expand Down
Loading