Skip to content

Add game-thread ANR detection on Android #1417

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

Closed
tustanivsky wants to merge 1 commit into from
Closed

Add game-thread ANR detection on Android #1417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 19 additions & 0 deletions plugin-dev/Source/Sentry/Private/Android/AndroidSentrySubsystem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@

#include "Dom/JsonObject.h"
#include "HAL/FileManager.h"
#include "HAL/PlatformTLS.h"
#include "Misc/CoreDelegates.h"
#include "Misc/FileHelper.h"
#include "Misc/OutputDeviceError.h"
Expand Down Expand Up @@ -73,6 +74,10 @@ void FAndroidSentrySubsystem::InitWithSettings(const USentrySettings* settings,
SettingsJson->SetBoolField(TEXT("sendDefaultPii"), settings->SendDefaultPii);
SettingsJson->SetBoolField(TEXT("enableAnrTracking"), settings->EnableAppNotRespondingTracking);
SettingsJson->SetNumberField(TEXT("anrTimeoutMillis"), settings->AppNotRespondingTimeout * 1000.0f);
if (settings->EnableAppNotRespondingTracking)
{
SettingsJson->SetNumberField(TEXT("anrThreadId"), static_cast<double>(FPlatformTLS::GetCurrentThreadId()));
}
SettingsJson->SetBoolField(TEXT("enableNdk"), settings->AndroidCrashBackend != ESentryAndroidCrashBackend::TombstoneOnly);
SettingsJson->SetBoolField(TEXT("enableTombstone"),
settings->AndroidCrashBackend == ESentryAndroidCrashBackend::TombstoneOnly || settings->AndroidCrashBackend == ESentryAndroidCrashBackend::TombstoneMergedWithNdk);
Expand Down Expand Up @@ -123,6 +128,14 @@ void FAndroidSentrySubsystem::InitWithSettings(const USentrySettings* settings,
TryCaptureScreenshot();
});
}

if (IsEnabled() && settings->EnableAppNotRespondingTracking)
{
AnrHeartbeatDelegateHandle = FCoreDelegates::OnEndFrame.AddLambda([]()
{
FSentryJavaObjectWrapper::CallStaticMethod<void>(SentryJavaClasses::SentryBridgeJava, "notifyAnrThreadAlive", "()V");
});
}
}

void FAndroidSentrySubsystem::Close()
Expand All @@ -133,6 +146,12 @@ void FAndroidSentrySubsystem::Close()
OnHandleSystemErrorDelegateHandle.Reset();
}

if (AnrHeartbeatDelegateHandle.IsValid())
{
FCoreDelegates::OnEndFrame.Remove(AnrHeartbeatDelegateHandle);
AnrHeartbeatDelegateHandle.Reset();
}

FSentryJavaObjectWrapper::CallStaticMethod<void>(SentryJavaClasses::Sentry, "flush", "(J)V", (jlong)3000);
FSentryJavaObjectWrapper::CallStaticMethod<void>(SentryJavaClasses::Sentry, "close", "()V");
}
Expand Down
1 change: 1 addition & 0 deletions plugin-dev/Source/Sentry/Private/Android/AndroidSentrySubsystem.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ class FAndroidSentrySubsystem : public ISentrySubsystem
bool isScreenshotAttachmentEnabled = false;

FDelegateHandle OnHandleSystemErrorDelegateHandle;
FDelegateHandle AnrHeartbeatDelegateHandle;
};

typedef FAndroidSentrySubsystem FPlatformSentrySubsystem;
7 changes: 7 additions & 0 deletions plugin-dev/Source/Sentry/Private/Android/Java/SentryBridgeJava.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,9 @@ public void configure(SentryAndroidOptions options) {
}
options.setAnrEnabled(settingJson.getBoolean("enableAnrTracking"));
options.setAnrTimeoutIntervalMillis(settingJson.getLong("anrTimeoutMillis"));
if (settingJson.has("anrThreadId")) {
options.setAnrThreadId(settingJson.getLong("anrThreadId"));
}
options.setEnableNdk(settingJson.getBoolean("enableNdk"));
options.setTombstoneEnabled(settingJson.getBoolean("enableTombstone"));
options.getLogs().setEnabled(settingJson.getBoolean("enableStructuredLogging"));
Expand Down Expand Up @@ -326,6 +329,10 @@ public static void clearAttachments() {
Sentry.getGlobalScope().clearAttachments();
}

public static void notifyAnrThreadAlive() {
io.sentry.AnrHeartbeatRegistry.notifyAlive();
}

public static void addLogFatal(final String message, final HashMap<String, Object> attributesMap) {
addLog(SentryLogLevel.FATAL, message, attributesMap);
}
Expand Down
Loading