Skip to content

[pull] main from getsentry:main - #407

Merged
pull[bot] merged 1 commit into
NOUIY:mainfrom
getsentry:main
Jul 29, 2026
Merged

[pull] main from getsentry:main#407
pull[bot] merged 1 commit into
NOUIY:mainfrom
getsentry:main

Conversation

@pull

@pull pull Bot commented Jul 29, 2026

Copy link
Copy Markdown

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

…5837)

* fix(replay): Post checkCanRecord to main thread to prevent deadlock

onScreenshotRecorded can run on the replay executor thread (PixelCopy
masked-capture and emit paths). checkCanRecord -> pauseInternal acquires
lifecycleLock — if another thread holds that lock and submits to the
same single-threaded executor, we deadlock.

When not already on the main thread, post checkCanRecord to the main
looper so it never runs on the executor. On main thread, call directly
to preserve existing synchronous behavior.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* fix test

* fix(replay): Move executor shutdown outside lifecycleLock in close()

Holding lifecycleLock while calling awaitTermination() deadlocks if any
executor task tries to acquire the same lock. Move shutdown after the
lock is released to cut this edge.

Ref: #5847

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* chore: Drop ponytail prefix from comment

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* test(replay): Add deadlock test for close() with blocked executor task

Verifies close() completes when an executor task is waiting on
lifecycleLock, ensuring shutdown happens outside the lock.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
@pull pull Bot locked and limited conversation to collaborators Jul 29, 2026
@pull pull Bot added the ⤵️ pull label Jul 29, 2026
@pull
pull Bot merged commit a30048b into NOUIY:main Jul 29, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant