Skip to content

chore: Merge master into 6.x - #1146

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

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

Conversation

@sentry-junior

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

Copy link
Copy Markdown
Contributor

Merges master into 6.x so the 6.x line gets 5.16.1, 5.17.0 and the changes since: the sub-request scope and span fixes (#1125, #1126), the session fix (#1129), the lazy user resolver (#1143), the new SDK options (#1124) and #1142.

Conflict resolutions:

  • composer.json and SentryBundle::SDK_VERSION: keep the 6.x values.
  • CHANGELOG.md: 6.0.0-beta1 stays on top, followed by 5.17.0 and 5.16.1.
  • New SDK options: profiles_sampler, profile_session_sample_rate, profile_lifecycle and metric_flush_threshold are added to the configuration and the DI fixtures, without enable_logs and enable_metrics, which 6.x removed.
  • LoginListener, SubRequestListener and TracingSubRequestListener: master's changes are ported from HubInterface to Sentry\SentryBundle\Sentry and IsolationScope. Data collection is read from the client options instead of DataCollectionPolicy::fromHub().
  • The new tests and End2End app code (SubRequestController, tracing.yml, MainController, LoginListenerTest and the sub-request listener tests) are ported the same way.

The lazy user resolver in LoginListener calls IsolationScope::setUserResolver(), which sentry-php added to 5.x in getsentry/sentry-php#2405 and released in 5.0.0-beta2. This PR therefore raises the requirement to sentry/sentry: ^5.0.0-beta2.

via @Litarnus.

--

View Session [Sentry]

Co-Authored-By: Martin Linzmayer <8436563+Litarnus@users.noreply.github.com>
@Litarnus
Litarnus marked this pull request as ready for review November 19, 2026 17:41
@Litarnus
Litarnus requested review from a team and stayallive as code owners November 19, 2026 17:41
@sentry-junior
sentry-junior Bot requested a review from Litarnus November 19, 2026 17:42
@Litarnus
Litarnus merged commit ab5222a into 6.x Nov 19, 2026
51 checks passed
@Litarnus
Litarnus deleted the merge/master-into-6.x branch November 19, 2026 17:47
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.

3 participants