Repository navigation
chore: Merge master into 6.x - #1146
Merged
Merged
Conversation
Co-authored-by: sentry-junior[bot] <264270552+sentry-junior[bot]@users.noreply.github.com> Co-authored-by: Martin Linzmayer <martin.linzmayer@sentry.io>
…o drop baseline entry (#1142) 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>
Co-Authored-By: Martin Linzmayer <8436563+Litarnus@users.noreply.github.com>
Litarnus
approved these changes
Nov 19, 2026
2 tasks done
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merges
masterinto6.xso 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.jsonandSentryBundle::SDK_VERSION: keep the 6.x values.CHANGELOG.md:6.0.0-beta1stays on top, followed by5.17.0and5.16.1.profiles_sampler,profile_session_sample_rate,profile_lifecycleandmetric_flush_thresholdare added to the configuration and the DI fixtures, withoutenable_logsandenable_metrics, which 6.x removed.LoginListener,SubRequestListenerandTracingSubRequestListener: master's changes are ported fromHubInterfacetoSentry\SentryBundle\SentryandIsolationScope. Data collection is read from the client options instead ofDataCollectionPolicy::fromHub().SubRequestController,tracing.yml,MainController,LoginListenerTestand the sub-request listener tests) are ported the same way.The lazy user resolver in
LoginListenercallsIsolationScope::setUserResolver(), which sentry-php added to 5.x in getsentry/sentry-php#2405 and released in5.0.0-beta2. This PR therefore raises the requirement tosentry/sentry: ^5.0.0-beta2.via @Litarnus.
--
View Session [Sentry]