diff --git a/CHANGELOG.md b/CHANGELOG.md index ec472fa8f..e9cf41707 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## Unreleased +### Features + +- Add pluging setting allowing to attach all threads info to captured events (Android) ([#1137](https://github.com/getsentry/sentry-unreal/pull/1137)) + ### Dependencies - Bump Native SDK from v0.12.0 to v0.12.1 ([#1136](https://github.com/getsentry/sentry-unreal/pull/1136)) diff --git a/plugin-dev/Source/Sentry/Private/Android/AndroidSentrySubsystem.cpp b/plugin-dev/Source/Sentry/Private/Android/AndroidSentrySubsystem.cpp index 144cb2b5e..036a110e0 100644 --- a/plugin-dev/Source/Sentry/Private/Android/AndroidSentrySubsystem.cpp +++ b/plugin-dev/Source/Sentry/Private/Android/AndroidSentrySubsystem.cpp @@ -56,6 +56,7 @@ void FAndroidSentrySubsystem::InitWithSettings(const USentrySettings* settings, SettingsJson->SetBoolField(TEXT("autoSessionTracking"), settings->EnableAutoSessionTracking); SettingsJson->SetNumberField(TEXT("sessionTimeout"), settings->SessionTimeout); SettingsJson->SetBoolField(TEXT("enableStackTrace"), settings->AttachStacktrace); + SettingsJson->SetBoolField(TEXT("enableThreads"), settings->AttachThreads); SettingsJson->SetBoolField(TEXT("debug"), settings->Debug); SettingsJson->SetNumberField(TEXT("sampleRate"), settings->SampleRate); SettingsJson->SetNumberField(TEXT("maxBreadcrumbs"), settings->MaxBreadcrumbs); diff --git a/plugin-dev/Source/Sentry/Private/Android/Java/SentryBridgeJava.java b/plugin-dev/Source/Sentry/Private/Android/Java/SentryBridgeJava.java index f42780715..d8f21a67d 100644 --- a/plugin-dev/Source/Sentry/Private/Android/Java/SentryBridgeJava.java +++ b/plugin-dev/Source/Sentry/Private/Android/Java/SentryBridgeJava.java @@ -57,6 +57,7 @@ public void configure(SentryAndroidOptions options) { options.setEnableAutoSessionTracking(settingJson.getBoolean("autoSessionTracking")); options.setSessionTrackingIntervalMillis(settingJson.getLong("sessionTimeout")); options.setAttachStacktrace(settingJson.getBoolean("enableStackTrace")); + options.setAttachThreads(settingJson.getBoolean("enableThreads")); options.setDebug(settingJson.getBoolean("debug")); options.setSampleRate(settingJson.getDouble("sampleRate")); options.setMaxBreadcrumbs(settingJson.getInt("maxBreadcrumbs")); diff --git a/plugin-dev/Source/Sentry/Private/SentrySettings.cpp b/plugin-dev/Source/Sentry/Private/SentrySettings.cpp index 57fc3e5b3..be457688b 100644 --- a/plugin-dev/Source/Sentry/Private/SentrySettings.cpp +++ b/plugin-dev/Source/Sentry/Private/SentrySettings.cpp @@ -19,6 +19,7 @@ USentrySettings::USentrySettings(const FObjectInitializer& ObjectInitializer) , SampleRate(1.0f) , EnableAutoLogAttachment(false) , AttachStacktrace(true) + , AttachThreads(true) , SendDefaultPii(false) , AttachScreenshot(false) , AttachGpuDump(true) diff --git a/plugin-dev/Source/Sentry/Public/SentrySettings.h b/plugin-dev/Source/Sentry/Public/SentrySettings.h index e03328725..68932c839 100644 --- a/plugin-dev/Source/Sentry/Public/SentrySettings.h +++ b/plugin-dev/Source/Sentry/Public/SentrySettings.h @@ -242,6 +242,10 @@ class SENTRY_API USentrySettings : public UObject Meta = (DisplayName = "Attach stack trace to captured events", ToolTip = "Flag indicating whether to attach stack trace automatically to captured events.")) bool AttachStacktrace; + UPROPERTY(Config, EditAnywhere, Category = "General|Attachments", + Meta = (DisplayName = "Attach information about all threads to captured events (for Android only)", ToolTip = "Flag indicating whether to attach information about all threads automatically to captured events, not just the crashing thread.")) + bool AttachThreads; + UPROPERTY(Config, EditAnywhere, Category = "General|Attachments", Meta = (DisplayName = "Attach personally identifiable information", ToolTip = "Flag indicating whether to attach personally identifiable information (PII) to captured events.")) bool SendDefaultPii;