Skip to content

Fix deadlock when invoking onConfigureScope callback during garbage collection on Android #1181

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tustanivsky merged 4 commits into from
Jan 6, 2026
Merged

Fix deadlock when invoking onConfigureScope callback during garbage collection on Android #1181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7a3e2de
Fix deadlock when invoking `onConfigureScope` callback during garbage…
tustanivsky Dec 29, 2025
2f4a0e8
Update changelog
tustanivsky Dec 29, 2025
1f51ee2
Clean up delegate
tustanivsky Dec 29, 2025
75efd0e
Clean up improvement
tustanivsky Dec 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
### Fixes

- Misleading screenshot capture logs on unsupported platforms ([#1180](https://github.com/getsentry/sentry-unreal/pull/1180))
- Deadlock when invoking `onConfigureScope` callback during garbage collection on Android ([#1181](https://github.com/getsentry/sentry-unreal/pull/1181))

## 1.4.0

Expand Down
14 changes: 5 additions & 9 deletions plugin-dev/Source/Sentry/Private/Android/Jni/AndroidSentryJni.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,19 +34,15 @@

JNI_METHOD void Java_io_sentry_unreal_SentryBridgeJava_onConfigureScope(JNIEnv* env, jclass clazz, jlong callbackId, jobject scope)
{
FGCScopeGuard GCScopeGuard;

if (FUObjectThreadContext::Get().IsRoutingPostLoad)
{
UE_LOG(LogSentrySdk, Log, TEXT("Executing `onConfigureScope` handler is not allowed when post-loading."));
return;
}

FSentryScopeDelegate* callback = AndroidSentryScopeCallback::GetDelegateById(callbackId);

if (callback != nullptr)
{
callback->Execute(MakeShareable(new FAndroidSentryScope(scope)));
if (SentryCallbackUtils::IsCallbackSafeToRun())
{
callback->Execute(MakeShareable(new FAndroidSentryScope(scope)));
}

AndroidSentryScopeCallback::RemoveDelegate(callbackId);
}
}
Expand Down