Skip to content

refactor(agent): Utilize OAPI to automatically dispatch to wrappers #886

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

Draft
wants to merge 23 commits into
base: zjn/oapi/remove-clean
Choose a base branch
from
+600 −18
Draft

refactor(agent): Utilize OAPI to automatically dispatch to wrappers #886

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
6390edd
initial commit
ZNeumann Apr 30, 2024
1a90428
consistent timings
ZNeumann May 1, 2024
942f0e2
fixups
ZNeumann May 2, 2024
8c97ad4
fixups
ZNeumann May 2, 2024
d596581
fix instrumented function metric
ZNeumann May 3, 2024
b983eb7
fix transient wrapper creation
ZNeumann May 7, 2024
beede69
fix double segments
ZNeumann May 8, 2024
9810417
fix guzzle
ZNeumann May 9, 2024
5c58d76
fix return value stuff
ZNeumann May 10, 2024
7ad1ab2
fix wrapper tracking
ZNeumann May 14, 2024
bd0df11
try not using zend lookup
ZNeumann May 15, 2024
1cb4b16
fix
ZNeumann May 15, 2024
cd274ad
revert version change
ZNeumann May 15, 2024
a9656a8
TEMP remove metric
ZNeumann May 15, 2024
6515a43
cleanup dispatch functions
ZNeumann May 21, 2024
643009b
unify handler overwrite into function
ZNeumann May 22, 2024
61fd225
add exception handler fcall_end
ZNeumann May 22, 2024
1a9b953
InstrumentedFunction supp metric on first call only
ZNeumann May 22, 2024
f01406b
add metric for ini instrumented
ZNeumann May 23, 2024
5c966b2
fixup
ZNeumann May 29, 2024
6845e9b
fix
ZNeumann May 29, 2024
0b74c04
cleanup
ZNeumann May 29, 2024
6de6199
fix ZEND_OBSERVER_NOT_OBSERVED is 2 instead of NULL
ZNeumann Aug 8, 2024
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
Prev Previous commit
Next Next commit
add exception handler fcall_end
  • Loading branch information
@ZNeumann @lavarou
ZNeumann authored and lavarou committed Nov 6, 2024
commit 61fd2254ebb9baf716d559dc45350192ba2f07b9
24 changes: 16 additions & 8 deletions agent/php_execute.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2054,7 +2054,7 @@ static void nr_php_instrument_func_end(NR_EXECUTE_PROTO) {
bool create_metric = false;
nr_php_execute_metadata_t metadata = {0};
#else
static void nr_php_instrument_func_end(NR_EXECUTE_PROTO, bool create_metric, bool end_segment) {
static void nr_php_instrument_func_end(NR_EXECUTE_PROTO, bool create_metric, bool end_segment, bool is_exception_handler) {
#endif
nr_segment_t* segment = NULL;
nrtime_t txn_start_time = 0;
Expand Down Expand Up @@ -2093,8 +2093,10 @@ static void nr_php_instrument_func_end(NR_EXECUTE_PROTO, bool create_metric, boo

#if ZEND_MODULE_API_NO < ZEND_8_2_X_API_NO
wraprec = segment->wraprec;

if (segment->is_exception_handler) {
#else
if (is_exception_handler) {
#endif
/*
* After running the exception handler segment, create an error from
* the exception it handled, and save the error in the transaction.
Expand All @@ -2108,9 +2110,10 @@ static void nr_php_instrument_func_end(NR_EXECUTE_PROTO, bool create_metric, boo
nr_php_error_record_exception(
NRPRG(txn), exception, nr_php_error_get_priority(E_ERROR), false,
"Uncaught exception ", &NRPRG(exception_filters) TSRMLS_CC);
#if ZEND_MODULE_API_NO < ZEND_8_2_X_API_NO
} else if (NULL == nr_php_get_return_value(NR_EXECUTE_ORIG_ARGS)) {
#else
if (NULL == func_return_value) {
} else if (NULL == func_return_value) {
#endif
/*
* Having no return value (and not being an exception handler) indicates
Expand Down Expand Up @@ -2250,7 +2253,8 @@ void nr_php_observer_fcall_begin(zend_execute_data* execute_data) {
static void nr_php_observer_fcall_end_common(zend_execute_data* execute_data,
zval* func_return_value,
bool create_metric,
bool end_segment) {
bool end_segment,
bool is_exception_handler) {
#else
void nr_php_observer_fcall_end(zend_execute_data* execute_data,
zval* func_return_value) {
Expand Down Expand Up @@ -2281,7 +2285,7 @@ void nr_php_observer_fcall_end(zend_execute_data* execute_data,
}

#if ZEND_MODULE_API_NO >= ZEND_8_2_X_API_NO
nr_php_instrument_func_end(NR_EXECUTE_ORIG_ARGS, create_metric, end_segment);
nr_php_instrument_func_end(NR_EXECUTE_ORIG_ARGS, create_metric, end_segment, is_exception_handler);
#else
nr_php_instrument_func_end(NR_EXECUTE_ORIG_ARGS);
#endif
Expand All @@ -2301,15 +2305,19 @@ void nr_php_observer_fcall_begin_instrumented(zend_execute_data* execute_data) {
}
void nr_php_observer_fcall_end(zend_execute_data* execute_data,
zval* func_return_value) {
nr_php_observer_fcall_end_common(execute_data, func_return_value, false, true);
nr_php_observer_fcall_end_common(execute_data, func_return_value, false, true, false);
}
void nr_php_observer_fcall_end_create_metric(zend_execute_data* execute_data,
zval* func_return_value) {
nr_php_observer_fcall_end_common(execute_data, func_return_value, true, true);
nr_php_observer_fcall_end_common(execute_data, func_return_value, true, true, false);
}
void nr_php_observer_fcall_end_keep_segment(zend_execute_data* execute_data,
zval* func_return_value) {
nr_php_observer_fcall_end_common(execute_data, func_return_value, false, false);
nr_php_observer_fcall_end_common(execute_data, func_return_value, false, false, false);
}
void nr_php_observer_fcall_end_exception_handler(zend_execute_data* execute_data,
zval* func_return_value) {
nr_php_observer_fcall_end_common(execute_data, func_return_value, false, true, true);
}

// These empty functions (rather than NULL) are used to know if instrumentation
Expand Down
12 changes: 8 additions & 4 deletions agent/php_observer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,9 +121,11 @@ static zend_observer_fcall_handlers nr_php_fcall_register_handlers(
nr_php_observer_fcall_begin_instrumented;
handlers.end = wraprec->special_instrumentation ?
(zend_observer_fcall_end_handler)wraprec->special_instrumentation :
wraprec->create_metric ?
nr_php_observer_fcall_end_create_metric :
nr_php_observer_fcall_end;
wraprec->is_exception_handler ?
nr_php_observer_fcall_end_exception_handler :
wraprec->create_metric ?
nr_php_observer_fcall_end_create_metric :
nr_php_observer_fcall_end;
return handlers;
}

Expand Down Expand Up @@ -152,7 +154,9 @@ void nr_php_observer_overwrite_handlers(zend_function* func, nruserfn_t* wraprec
nr_php_observer_empty_fcall_end)) {
zend_observer_add_end_handler(func, wraprec->special_instrumentation ?
(zend_observer_fcall_end_handler)wraprec->special_instrumentation :
nr_php_observer_fcall_end);
wraprec->is_exception_handler ?
nr_php_observer_fcall_end_exception_handler :
nr_php_observer_fcall_end);
}
}
}
Expand Down
6 changes: 4 additions & 2 deletions agent/php_observer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,12 @@ void nr_php_observer_empty_fcall_end(zend_execute_data* execute_data,
zval* func_return_value);
void nr_php_observer_fcall_begin_late(zend_execute_data* execute_data, nrtime_t txn_start_time);
void nr_php_observer_fcall_end_keep_segment(zend_execute_data* execute_data,
zval* func_return_value);
zval* func_return_value);
void nr_php_observer_fcall_end_late(zend_execute_data* execute_data, bool create_metric, nrtime_t txn_start_time);
void nr_php_observer_fcall_end_create_metric(zend_execute_data* execute_data,
zval* func_return_value);
zval* func_return_value);
void nr_php_observer_fcall_end_exception_handler(zend_execute_data* execute_data,
zval* func_return_value);
#endif /* PHP 8.2+ */
#endif /* PHP8+ */

Expand Down