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

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
consistent timings
  • Loading branch information
@ZNeumann @lavarou
ZNeumann authored and lavarou committed Nov 6, 2024
commit 1a90428dc9b7cb11542b1c41adb1f0eb5a1c2649
11 changes: 3 additions & 8 deletions agent/php_wrapper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,8 @@ extern zval** nr_php_get_return_value_ptr(TSRMLS_D);
} else { \
func_return_value_ptr = nr_php_get_return_value_ptr(); \
func_return_value = func_return_value_ptr ? *func_return_value_ptr : NULL;\
nr_php_observer_fcall_end(execute_data, \
func_return_value_ptr ? *func_return_value_ptr : NULL); \
}
#endif

Expand All @@ -303,9 +305,6 @@ extern zval** nr_php_get_return_value_ptr(TSRMLS_D);
__attribute__((unused)); \
if (!was_executed) { \
NR_PHP_WRAPPER_CALL \
} \
if (!is_begin) { \
nr_php_observer_fcall_end(execute_data, func_return_value); \
} \
\
if (zcaught) { \
Expand All @@ -323,11 +322,7 @@ extern zval** nr_php_get_return_value_ptr(TSRMLS_D);
if (!was_executed) { \
NR_PHP_WRAPPER_CALL \
} \
if (!is_begin) { \
func_return_value_ptr = nr_php_get_return_value_ptr(); \
nr_php_observer_fcall_end(execute_data, \
func_return_value_ptr ? *func_return_value_ptr : NULL); \
} else { \
if (is_begin) { \
nr_php_observer_fcall_begin_late(execute_data, txn_start_time);\
} \
if (zcaught) { \
Expand Down