Skip to content

feat(internal): add scope observer #1839

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
jpnurmi wants to merge 16 commits into
base: master
Choose a base branch
from
Open

feat(internal): add scope observer #1839

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
0dd5a91
feat(internal): scope observer
jpnurmi Jul 1, 2026
1cb1850
sentry_scope_update_context: add missing notify
jpnurmi Jul 3, 2026
aa5c682
sentry__ringbuffer_append returns -1 on failure
jpnurmi Jul 3, 2026
5628e92
don't notify duplicate attachments
jpnurmi Jul 3, 2026
c2e1228
sentry_transaction_start: notify
jpnurmi Jul 3, 2026
5b18a2c
notity scope-level attachment changes
jpnurmi Jul 3, 2026
5c6bd80
fix sentry_clear_attachments
jpnurmi Jul 3, 2026
95a32c5
add_observer: return bool
jpnurmi Jul 4, 2026
baf6565
add remove_observer
jpnurmi Jul 4, 2026
229a6e8
update tests
jpnurmi Jul 4, 2026
b1c9d90
prevent array shift during notify iteration
jpnurmi Jul 4, 2026
1e2c76d
fix nested notify
jpnurmi Jul 4, 2026
a8e331c
test no flush
jpnurmi Jul 4, 2026
cc2d492
was_notifying (tsan)
jpnurmi Jul 4, 2026
c2273af
trace context
jpnurmi Jul 4, 2026
8bdc687
Revert "trace context"
jpnurmi Jul 6, 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
10 changes: 6 additions & 4 deletions src/sentry_attachment.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,25 +262,27 @@ sentry__attachments_add_path(sentry_attachment_t **attachments_ptr,
return sentry__attachments_add(attachments_ptr, attachment);
}

void
bool
sentry__attachments_remove(
sentry_attachment_t **attachments_ptr, sentry_attachment_t *attachment)
{
if (!attachment) {
return;
return false;
}

sentry_attachment_t **next_ptr = attachments_ptr;

for (sentry_attachment_t *it = *attachments_ptr; it; it = it->next) {
if (it == attachment) {
*next_ptr = it->next;
sentry__attachment_free(it);
return;
it->next = NULL;
return true;
}

next_ptr = &it->next;
}

return false;
}

static sentry_attachment_t *
Expand Down
3 changes: 2 additions & 1 deletion src/sentry_attachment.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,9 @@ sentry_attachment_t *sentry__attachments_add_path(

/**
* Removes an attachment from the attachments list at `attachments_ptr`.
* Returns true if the attachment was found and removed.
*/
void sentry__attachments_remove(
bool sentry__attachments_remove(
sentry_attachment_t **attachments_ptr, sentry_attachment_t *attachment);

/**
Expand Down
66 changes: 51 additions & 15 deletions src/sentry_core.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -900,6 +900,7 @@ sentry_set_release_n(const char *release, size_t release_len)
scope->release = sentry__string_clone_n(release, release_len);
sentry_value_set_by_key(scope->dynamic_sampling_context, "release",
sentry_value_new_string(scope->release));
SENTRY_SCOPE_NOTIFY(scope, set_release, release, release_len);
}
}

Expand All @@ -918,6 +919,8 @@ sentry_set_environment_n(const char *environment, size_t environment_len)
= sentry__string_clone_n(environment, environment_len);
sentry_value_set_by_key(scope->dynamic_sampling_context, "environment",
sentry_value_new_string(scope->environment));
SENTRY_SCOPE_NOTIFY(
scope, set_environment, environment, environment_len);
}
}

Expand Down Expand Up @@ -982,16 +985,15 @@ sentry_set_tag_n(
void
sentry_remove_tag(const char *key)
{
SENTRY_WITH_SCOPE_MUT (scope) {
sentry_value_remove_by_key(scope->tags, key);
}
sentry_remove_tag_n(key, sentry__guarded_strlen(key));
}

void
sentry_remove_tag_n(const char *key, size_t key_len)
{
SENTRY_WITH_SCOPE_MUT (scope) {
sentry_value_remove_by_key_n(scope->tags, key, key_len);
SENTRY_SCOPE_NOTIFY(scope, remove_tag, key, key_len);
}
}

Expand All @@ -1016,6 +1018,8 @@ sentry_remove_extra(const char *key)
{
SENTRY_WITH_SCOPE_MUT (scope) {
sentry_value_remove_by_key(scope->extra, key);
SENTRY_SCOPE_NOTIFY(
scope, remove_extra, key, sentry__guarded_strlen(key));
}
}

Expand All @@ -1024,6 +1028,7 @@ sentry_remove_extra_n(const char *key, size_t key_len)
{
SENTRY_WITH_SCOPE_MUT (scope) {
sentry_value_remove_by_key_n(scope->extra, key, key_len);
SENTRY_SCOPE_NOTIFY(scope, remove_extra, key, key_len);
}
}

Expand Down Expand Up @@ -1097,6 +1102,8 @@ sentry__set_propagation_context(const char *key, sentry_value_t value)
{
SENTRY_WITH_SCOPE_MUT (scope) {
sentry_value_set_by_key(scope->propagation_context, key, value);
SENTRY_SCOPE_NOTIFY(
scope, set_context, key, sentry__guarded_strlen(key), value);
}
}

Expand Down Expand Up @@ -1131,6 +1138,8 @@ sentry_remove_context(const char *key)
{
SENTRY_WITH_SCOPE_MUT (scope) {
sentry_value_remove_by_key(scope->contexts, key);
SENTRY_SCOPE_NOTIFY(
scope, remove_context, key, sentry__guarded_strlen(key));
}
}

Expand All @@ -1139,6 +1148,7 @@ sentry_remove_context_n(const char *key, size_t key_len)
{
SENTRY_WITH_SCOPE_MUT (scope) {
sentry_value_remove_by_key_n(scope->contexts, key, key_len);
SENTRY_SCOPE_NOTIFY(scope, remove_context, key, key_len);
}
}

Expand Down Expand Up @@ -1175,6 +1185,7 @@ sentry_remove_fingerprint(void)
SENTRY_WITH_SCOPE_MUT (scope) {
sentry_value_decref(scope->fingerprint);
scope->fingerprint = sentry_value_new_null();
SENTRY_SCOPE_NOTIFY(scope, set_fingerprint, scope->fingerprint);
}
}

Expand Down Expand Up @@ -1229,6 +1240,9 @@ sentry_regenerate_trace(void)
generate_propagation_context(scope->propagation_context);
scope->trace_managed = false;
sentry__scope_update_dsc(scope, options);
SENTRY_SCOPE_NOTIFY(scope, set_context, "trace",
sentry__guarded_strlen("trace"),
sentry_value_get_by_key(scope->propagation_context, "trace"));
Comment thread
sentry[bot] marked this conversation as resolved.
}
}
}
Expand All @@ -1243,6 +1257,8 @@ sentry_set_transaction(const char *transaction)
if (scope->transaction_object) {
sentry_transaction_set_name(scope->transaction_object, transaction);
}
SENTRY_SCOPE_NOTIFY(scope, set_transaction, transaction,
sentry__guarded_strlen(transaction));
}
}

Expand All @@ -1258,6 +1274,8 @@ sentry_set_transaction_n(const char *transaction, size_t transaction_len)
sentry_transaction_set_name_n(
scope->transaction_object, transaction, transaction_len);
}
SENTRY_SCOPE_NOTIFY(
scope, set_transaction, transaction, transaction_len);
Comment thread
cursor[bot] marked this conversation as resolved.
}
}

Expand Down Expand Up @@ -1330,6 +1348,10 @@ sentry_transaction_start_ts(sentry_transaction_context_t *opaque_tx_ctx,
sentry_value_remove_by_key(tx, "parent_span_id");
sentry_value_remove_by_key(tx, "sampled");
sentry__scope_update_dsc(scope, options);
SENTRY_SCOPE_NOTIFY(scope, set_context, "trace",
sentry__guarded_strlen("trace"),
sentry_value_get_by_key(
scope->propagation_context, "trace"));
}
}
}
Expand Down Expand Up @@ -1904,13 +1926,17 @@ sentry_capture_minidump_n(const char *path, size_t path_len)
static sentry_attachment_t *
add_attachment(sentry_attachment_t *attachment)
{
if (!attachment) {
return NULL;
}

SENTRY_WITH_OPTIONS (options) {
if (options->backend && options->backend->add_attachment_func) {
options->backend->add_attachment_func(options->backend, attachment);
}
}
SENTRY_WITH_SCOPE_MUT (scope) {
attachment = sentry__attachments_add(&scope->attachments, attachment);
attachment = sentry__scope_add_attachment(scope, attachment);
}
return attachment;
}
Comment thread
sentry[bot] marked this conversation as resolved.
Expand Down Expand Up @@ -1948,31 +1974,41 @@ sentry_clear_attachments(void)
{
SENTRY_WITH_OPTIONS (options) {
SENTRY_WITH_SCOPE_MUT (scope) {
if (options->backend && options->backend->remove_attachment_func) {
for (sentry_attachment_t *it = scope->attachments; it;
it = it->next) {
sentry_attachment_t *attachments = scope->attachments;
scope->attachments = NULL;
for (sentry_attachment_t *it = attachments; it; it = it->next) {
if (options->backend
&& options->backend->remove_attachment_func) {
options->backend->remove_attachment_func(
options->backend, it);
}
SENTRY_SCOPE_NOTIFY(scope, remove_attachment, it);
Comment thread
cursor[bot] marked this conversation as resolved.
}
sentry__attachments_free(scope->attachments);
scope->attachments = NULL;
sentry__attachments_free(attachments);
}
}
}

void
sentry_remove_attachment(sentry_attachment_t *attachment)
{
if (!attachment) {
return;
}

SENTRY_WITH_OPTIONS (options) {
if (options->backend && options->backend->remove_attachment_func) {
options->backend->remove_attachment_func(
options->backend, attachment);
SENTRY_WITH_SCOPE_MUT (scope) {
if (sentry__attachments_remove(&scope->attachments, attachment)) {
if (options->backend
&& options->backend->remove_attachment_func) {
options->backend->remove_attachment_func(
options->backend, attachment);
}
SENTRY_SCOPE_NOTIFY(scope, remove_attachment, attachment);
sentry__attachment_free(attachment);
}
Comment thread
jpnurmi marked this conversation as resolved.
}
}
SENTRY_WITH_SCOPE_MUT (scope) {
sentry__attachments_remove(&scope->attachments, attachment);
}
}

#ifdef SENTRY_PLATFORM_WINDOWS
Expand Down
Loading
Loading