Merge master changes #1988
Merged
Merge master changes #1988
Conversation
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
Co-authored-by: Michi Hoffmann <cleptric@users.noreply.github.com>
…andler (#1931) Co-authored-by: Deeka Wong <8337659+huangdijia@users.noreply.github.com>
Co-authored-by: Martin Linzmayer <martin.linzmayer@sentry.io>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…#1972) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Michael Hoffmann <michi@sentry.io>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
# Conflicts: # composer.json # phpstan-baseline.neon # psalm.xml.dist # src/Event.php # src/EventType.php # src/Metrics/Metrics.php # src/Options.php # src/Tracing/Span.php # src/Unit.php # src/functions.php # tests/Metrics/MetricsTest.php # tests/OptionsTest.php # tests/Serializer/PayloadSerializerTest.php # tests/Serializer/SerializerTest.php
![sentry[bot]](https://avatars.githubusercontent.com/u/1396951?s=60&v=4){kind=small}
|
|
||
| return filter_var($booleanOrUrl, \FILTER_VALIDATE_BOOLEAN); | ||
| } | ||
|
|
This comment was marked as outdated.
This comment was marked as outdated.
Sorry, something went wrong.
![cursor[bot]](https://avatars.githubusercontent.com/in/1210556?s=60&v=4){kind=small}
Litarnus
force-pushed
the
merge-master-changes
branch
from
c9de2a6 to
c921f00
Compare
| } | ||
|
|
||
| return $this; | ||
| } |
There was a problem hiding this comment.
Bug: Span flag updates blocked after reaching max limit
The setFlag method blocks all flag operations once MAX_FLAGS (10) is reached, including updates to existing flags. The condition count($this->flags) < self::MAX_FLAGS prevents both new flags AND updates to existing ones when the limit is hit. If a flag was added early and needs its value changed later after 10 flags exist, the update is silently ignored. The check doesn't account for whether the key already exists in the array, where an update wouldn't increase the count.
Collaborator
There was a problem hiding this comment.
That is also IIRC to spec!
stayallive
approved these changes
Dec 16, 2025
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.
No description provided.