Repository navigation
chore: Merge master into 5.x - #2405
Merged
Merged
Conversation
…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>
… 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>
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
masterinto5.xso 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: keep5.0.0-beta1.CHANGELOG.md:5.0.0-beta1stays on top, followed by4.38.0and4.37.1. The beta1 AI prompt takes thedata_collectionclarification 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$transactionredeclaration, with the 5.x client lookup.phpstan-baseline.neon: keep the 5.x entries and drop theCodeLocationResolverentry 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:
ScopeDataand is exposed asMutableScope::setUserResolver().removeUser()andclear()drop it, like on master.segmentis not copied from the resolved user, because 5.x removed it fromUserDataBag.IsolationScope, and the newHttpTransportTestassertion uses the 5.xSentrySdk::init(Client)signature.Open question: is the isolation-over-global precedence for the resolver what we want?
via @Litarnus.
--
View Session [Sentry]