Skip to content

chore: Merge master into 5.x - #2405

Merged
Litarnus merged 15 commits into
5.xfrom
merge/master-into-5.x
Nov 19, 2026
Merged

Litarnus merged 15 commits into
5.xfrom
merge/master-into-5.x

Conversation

@sentry-junior

@sentry-junior sentry-junior Bot commented Nov 19, 2026

Copy link
Copy Markdown
Contributor

Merges master into 5.x so the 5.x line gets 4.37.1, 4.38.0 and the changes since, including the user resolver (#2396) and the client report fix (#2401). sentry-symfony 6.x needs the user resolver on 5.x for its lazy user resolution.

Conflict resolutions:

  • Client::SDK_VERSION: keep 5.0.0-beta1.
  • CHANGELOG.md: 5.0.0-beta1 stays on top, followed by 4.38.0 and 4.37.1. The beta1 AI prompt takes the data_collection clarification from the master backport. The upgrade guide link stays relative.
  • HttpCookieCollector: keep 5.x, which already removed the deprecated methods master touched.
  • Transaction::getDynamicSamplingContext(): pass $this, since master dropped the $transaction redeclaration, with the 5.x client lookup.
  • phpstan-baseline.neon: keep the 5.x entries and drop the CodeLocationResolver entry that master fixed.
  • analysis-baseline.toml: regenerated, because master bumps Mago to 1.60.2.

The user resolver is ported to the 5.x scopes:

  • The resolver lives in ScopeData and is exposed as MutableScope::setUserResolver(). removeUser() and clear() drop it, like on master.
  • When the global and isolation scopes are merged, the isolation scope's resolver wins, and the global one is used when the isolation scope has none.
  • segment is not copied from the resolved user, because 5.x removed it from UserDataBag.
  • The master tests for the resolver are adapted to IsolationScope, and the new HttpTransportTest assertion uses the 5.x SentrySdk::init(Client) signature.

Open question: is the isolation-over-global precedence for the resolver what we want?

via @Litarnus.

--

View Session [Sentry]

Litarnus and others added 15 commits November 17, 2026 18:02
…Stan baseline entry (#2392)

Co-authored-by: sentry-junior[bot] <264270552+sentry-junior[bot]@users.noreply.github.com>
Co-authored-by: sentry-junior[bot] <264270552+sentry-junior[bot]@users.noreply.github.com>
Co-authored-by: Martin Linzmayer <martin.linzmayer@sentry.io>
Co-authored-by: sentry-junior[bot] <264270552+sentry-junior[bot]@users.noreply.github.com>
Co-authored-by: Martin Linzmayer <martin.linzmayer@sentry.io>
…Mago baseline entry (#2398)

Co-authored-by: sentry-junior[bot] <264270552+sentry-junior[bot]@users.noreply.github.com>
…var to drop PHPStan baseline entry (#2393)

Co-authored-by: sentry-junior[bot] <264270552+sentry-junior[bot]@users.noreply.github.com>
… drop Mago baseline entry (#2397)

Co-authored-by: sentry-junior[bot] <264270552+sentry-junior[bot]@users.noreply.github.com>
Co-Authored-By: Martin Linzmayer <8436563+Litarnus@users.noreply.github.com>
@Litarnus
Litarnus marked this pull request as ready for review November 19, 2026 16:50
@Litarnus
Litarnus requested review from a team and stayallive as code owners November 19, 2026 16:50
@sentry-junior
sentry-junior Bot requested a review from Litarnus November 19, 2026 16:50
@Litarnus
Litarnus merged commit 0fb5f24 into 5.x Nov 19, 2026
54 checks passed
@Litarnus
Litarnus deleted the merge/master-into-5.x branch November 19, 2026 16:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants