feat!: add scope merging mechanism by giortzisg · Pull Request #1373 · getsentry/sentry-go

giortzisg · 2026-07-23T07:46:56Z

Description

This adds the scope merging mechanism by allocating a captureState object and copying all needed event attributes in place. This removes taking multiple scope clones on every capture.

The PR also includes breaking changes around EventModifier. The EventModifier was an agnostic modifier that was passed on ApplyToEvent. This duplicated the EventProcessor behavior and also complicated the scope merging mechanism, since we need to have a concrete *Scope type to merge the scopes. Furthermore, there is no documented behavior or signature for any EventModifier and this seems to be just the first archaic way to modify events before EventProcessor and BeforeSend hooks where a thing. Thus decided to remove this and have a concrete *Scope passed on ApplyToEvent. This behavior aligns with other sdks that pass a concrete scope.

This affects the public API with all the CaptureX methods now requiring a concrete scope to be passed, but further scope changes in the stack also change the CaptureX APIs to work with context.Context, so this change seems acceptable. Functionality isn't really removed but just shifted to BeforeSend hooks as intended.

Issues

resolves: Add scope merging for global and isolation scopes #1369
resolves: GO-155

Changelog Entry Instructions

To add a custom changelog entry, uncomment the section above. Supports:

Single entry: just write text
Multiple entries: use bullet points
Nested bullets: indent 4+ spaces

For more details: custom changelog entries

Reminders

Add GH Issue ID & Linear ID
PR title should use conventional commit style (feat:, fix:, ref:, meta:)
For external contributors: CONTRIBUTING.md, Sentry SDK development docs, Discord community

linear-code · 2026-07-23T07:51:03Z

GO-155

szokeasaurusrex

Admittedly only skimmed this, as the PR is quite huge, but I left a few questions

szokeasaurusrex · 2026-09-02T12:39:42Z

+// FillMap copies keys from src that are absent in dst. It allocates dst when
+// needed and never aliases src.


m: Please document the precedence between dst and src if both contain the same key with different corresponding values.

szokeasaurusrex · 2026-09-02T13:25:20Z

+type signalCaptureContext struct {
+	scope             *Scope
+	ctx               context.Context
+	fallback          context.Context
+	defaultAttributes map[string]attribute.Value


l: Please document what this is, including documentation for the individual fields, because it is a bit unclear why we need this.

cursor

Stale Bugbot comment from a previous run.

cursor

Stale Bugbot comment from a previous run.

Apply the single scope selected by the capture context directly to events, preserve event precedence, enforce breadcrumb limits, and run request processing and event processors after releasing the scope lock. BREAKING CHANGE: Event values take precedence over scope values during capture, context scopes replace the global scope, and scope breadcrumbs and attachments are applied before event-specific values.

cursor

Cursor Bugbot has reviewed your changes and found 1 potential issue.

^{❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.}

^{Reviewed by Cursor Bugbot for commit 5d18fe6. Configure here.}

cursor · 2026-09-07T11:57:29Z

+				traceIDContextKey: traceID.String(),
+				spanIDContextKey:  spanID.String(),
+			})
+			return


External traces drop sampling context

Medium Severity

When an external trace resolver succeeds, applyTraceToEvent replaces the event trace context with only trace_id and span_id and returns. That drops Dynamic Sampling Context and other trace fields that were previously kept from the span or propagation context after only the IDs were overwritten.

Additional Locations (1)

scope.go#L470-L477

^{Reviewed by Cursor Bugbot for commit 5d18fe6. Configure here.}

giortzisg force-pushed the scopes/scope-merge branch from 8f6a8b4 to e509cb6 Compare July 23, 2026 08:45

giortzisg marked this pull request as ready for review July 23, 2026 08:51

cursor Bot reviewed Jul 23, 2026

View reviewed changes

Comment thread scope.go Outdated

giortzisg force-pushed the scopes/scope-merge branch from e509cb6 to 5ea0d02 Compare July 30, 2026 20:45

giortzisg force-pushed the scopes/scope-merge branch from 5ea0d02 to 2905cce Compare August 4, 2026 15:25

sentry Bot reviewed Aug 4, 2026

View reviewed changes

Comment thread scope.go Outdated

giortzisg force-pushed the scopes/scope-merge branch 2 times, most recently from 8b46a73 to b3bd79f Compare August 5, 2026 09:59

giortzisg force-pushed the scopes/scope-merge branch from b3bd79f to 5ab473f Compare August 10, 2026 11:28

sentry Bot reviewed Aug 10, 2026

View reviewed changes

Comment thread scope.go Outdated

giortzisg force-pushed the scopes/scope-merge branch from 5ab473f to a27e5e5 Compare August 10, 2026 11:36

giortzisg force-pushed the scopes/scope-merge branch 2 times, most recently from a32be8d to af060b8 Compare August 12, 2026 12:11

cursor Bot reviewed Aug 12, 2026

View reviewed changes

Comment thread scope.go

Comment thread scope.go Outdated

giortzisg force-pushed the scopes/scope-merge branch from 5146682 to 80b661b Compare August 13, 2026 12:27

sentry Bot reviewed Aug 13, 2026

View reviewed changes

Comment thread scope.go Outdated

cursor Bot reviewed Aug 13, 2026

View reviewed changes

Comment thread scope.go Outdated

Comment thread scope.go Outdated

giortzisg force-pushed the scopes/scope-merge branch from 80b661b to f1ba13c Compare August 13, 2026 12:38

sentry Bot reviewed Aug 13, 2026

View reviewed changes

Comment thread metrics.go Outdated

cursor Bot reviewed Aug 13, 2026

View reviewed changes

Comment thread client.go Outdated

giortzisg force-pushed the scopes/scope-merge branch from bf26935 to ec3c9a6 Compare August 24, 2026 10:17

sentry Bot reviewed Aug 24, 2026

View reviewed changes

Comment thread scope.go Outdated

giortzisg force-pushed the scopes/scope-merge branch from ec3c9a6 to 503b67b Compare August 31, 2026 10:50

sentry Bot reviewed Aug 31, 2026

View reviewed changes

Comment thread scope.go Outdated

giortzisg changed the title ~~feat: add scope merging mechanism~~ feat!: add scope merging mechanism Sep 1, 2026

giortzisg force-pushed the scopes/scope-merge branch from 503b67b to 24d5a46 Compare September 1, 2026 09:12

giortzisg requested review from Litarnus and szokeasaurusrex September 1, 2026 09:13

cursor Bot reviewed Sep 1, 2026

View reviewed changes

Comment thread client.go

szokeasaurusrex reviewed Sep 1, 2026

View reviewed changes

Comment thread internal/sentrytest/fixture.go

Comment thread client.go Outdated

Comment thread client.go

giortzisg force-pushed the scopes/scope-merge branch from 24d5a46 to ff67282 Compare September 1, 2026 12:57

sentry Bot reviewed Sep 1, 2026

View reviewed changes

Comment thread log.go

giortzisg force-pushed the scopes/scope-merge branch from ff67282 to c7f455b Compare September 2, 2026 07:58

szokeasaurusrex approved these changes Sep 2, 2026

View reviewed changes

giortzisg force-pushed the scopes/scope-merge branch from c7f455b to a7e13ce Compare September 4, 2026 13:11

cursor Bot reviewed Sep 4, 2026

View reviewed changes

Comment thread scope_merge.go Outdated

giortzisg force-pushed the scopes/scope-merge branch from a7e13ce to f1cf3a9 Compare September 4, 2026 13:26

giortzisg force-pushed the scopes/scope-merge branch from f1cf3a9 to ffd5441 Compare September 7, 2026 11:40

sentry Bot reviewed Sep 7, 2026

View reviewed changes

Comment thread scope.go

cursor Bot reviewed Sep 7, 2026

View reviewed changes

Comment thread scope.go

giortzisg force-pushed the scopes/scope-merge branch from ffd5441 to 5d18fe6 Compare September 7, 2026 11:49

cursor Bot reviewed Sep 7, 2026

View reviewed changes

		// FillMap copies keys from src that are absent in dst. It allocates dst when
		// needed and never aliases src.

Uh oh!

Conversation

giortzisg commented Jul 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Issues

Uh oh!

linear-code Bot commented Jul 23, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

szokeasaurusrex left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

szokeasaurusrex Sep 2, 2026

Choose a reason for hiding this comment

Uh oh!

szokeasaurusrex Sep 2, 2026

Choose a reason for hiding this comment

Uh oh!

cursor Bot left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

cursor Bot left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

cursor Bot left a comment

Choose a reason for hiding this comment

Uh oh!

cursor Bot Sep 7, 2026

Choose a reason for hiding this comment

External traces drop sampling context

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

giortzisg commented Jul 23, 2026 •

edited

Loading

cursor Bot left a comment •

edited

Loading

cursor Bot left a comment •

edited

Loading