Skip to content

feat: improve should_observe #16

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
Litarnus merged 1 commit into from
Jul 4, 2026
Merged

feat: improve should_observe #16

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
33 changes: 15 additions & 18 deletions sentry.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -753,23 +753,27 @@ static void sentry_emit_callback_failure_log(
zend_string_release(message);
}

static bool sentry_should_observe(zend_execute_data *execute_data) {
zend_class_entry *caller_class = execute_data->func->common.scope;
static sentry_instrumented_function *sentry_find_registration(const zend_function *func) {
if (zend_hash_num_elements(&SENTRY_G(instrumented_functions)) == 0) {
return NULL;
}

zend_string *key = sentry_build_key(
caller_class == NULL ? NULL : caller_class->name,
execute_data->func->common.function_name
func->common.scope == NULL ? NULL : func->common.scope->name,
func->common.function_name
);
zval *config_zv = zend_hash_find(&SENTRY_G(instrumented_functions), key);
zend_string_release(key);

if (key == NULL) {
return config_zv == NULL ? NULL : Z_PTR_P(config_zv);
}

static bool sentry_should_observe(zend_execute_data *execute_data) {
if (execute_data->func->common.function_name == NULL) {
return false;
}

const bool explicitly_instrumented = zend_hash_exists(&SENTRY_G(instrumented_functions), key);

zend_string_release(key);

if (explicitly_instrumented) {
if (sentry_find_registration(execute_data->func) != NULL) {
return true;
}

Expand Down Expand Up @@ -908,14 +912,7 @@ static void sentry_observer_begin(zend_execute_data *execute_data) {
execute_data->func->common.function_name
);

zend_string *key = sentry_build_key(
execute_data->func->common.scope == NULL ? NULL : execute_data->func->common.scope->name,
execute_data->func->common.function_name
);
zval *config_zv = zend_hash_find(&SENTRY_G(instrumented_functions), key);
zend_string_release(key);

sentry_instrumented_function *config = config_zv == NULL ? NULL : Z_PTR_P(config_zv);
sentry_instrumented_function *config = sentry_find_registration(execute_data->func);
zval *metadata = config == NULL ? NULL : &config->metadata;

zval attribute_metadata;
Expand Down
Loading