From b3d8b6f6ba4d9fc4f9e0a47280c3cb5d0cd12e12 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 10:16:45 +0200 Subject: [PATCH 1/3] chore: update modules/sentry-cocoa to 8.30.0 (#585) --- CHANGELOG.md | 3 +++ modules/sentry-cocoa | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4dd7494c..5702fde9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,9 @@ - Bump Cocoa SDK (iOS) from v8.29.0 to v8.29.1 ([#580](https://github.com/getsentry/sentry-unreal/pull/580)) - [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8291) - [diff](https://github.com/getsentry/sentry-cocoa/compare/8.29.0...8.29.1) +- Bump Cocoa SDK (iOS) from v8.29.1 to v8.30.0 ([#585](https://github.com/getsentry/sentry-unreal/pull/585)) + - [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8300) + - [diff](https://github.com/getsentry/sentry-cocoa/compare/8.29.1...8.30.0) ## 0.18.0 diff --git a/modules/sentry-cocoa b/modules/sentry-cocoa index 08862789..8fd4e804 160000 --- a/modules/sentry-cocoa +++ b/modules/sentry-cocoa @@ -1 +1 @@ -Subproject commit 08862789e1cbba7a9561bed69832a9306f339cd3 +Subproject commit 8fd4e804f2e72e0b9c1b189ce4e8349c4d10b6a2 From ec6484b1fbc4b732cc7e3b1c5ace6940d7936b14 Mon Sep 17 00:00:00 2001 From: Ivan Tustanivskyi Date: Wed, 26 Jun 2024 11:17:42 +0300 Subject: [PATCH 2/3] Remove warning about missing WER module (#584) * Remove WER warning * Update changelog * Update CHANGELOG.md Co-authored-by: Stefan Jandl --------- Co-authored-by: Stefan Jandl --- .../Private/Desktop/SentrySubsystemDesktop.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/plugin-dev/Source/Sentry/Private/Desktop/SentrySubsystemDesktop.cpp b/plugin-dev/Source/Sentry/Private/Desktop/SentrySubsystemDesktop.cpp index 759c13f4..db5aad61 100644 --- a/plugin-dev/Source/Sentry/Private/Desktop/SentrySubsystemDesktop.cpp +++ b/plugin-dev/Source/Sentry/Private/Desktop/SentrySubsystemDesktop.cpp @@ -47,13 +47,23 @@ void PrintVerboseLog(sentry_level_t level, const char *message, va_list args, vo char buffer[512]; vsnprintf(buffer, 512, message, args); + FString MessageBuf = FString(buffer); + + // The WER (Windows Error Reporting) module (crashpad_wer.dll) can't be distributed along with other Sentry binaries + // within the plugin package due to some UE Marketplace restrictions. Its absence doesn't affect crash capturing + // and the corresponding warning can be disregarded + if(MessageBuf.Equals(TEXT("crashpad WER handler module not found"))) + { + return; + } + #if !NO_LOGGING const FName SentryCategoryName(LogSentrySdk.GetCategoryName()); #else const FName SentryCategoryName(TEXT("LogSentrySdk")); #endif - GLog->CategorizedLogf(SentryCategoryName, SentryConvertorsDesktop::SentryLevelToLogVerbosity(level), TEXT("%s"), *FString(buffer)); + GLog->CategorizedLogf(SentryCategoryName, SentryConvertorsDesktop::SentryLevelToLogVerbosity(level), TEXT("%s"), *MessageBuf); } sentry_value_t HandleBeforeSend(sentry_value_t event, void *hint, void *closure) From 283a4651e79581696936fee611c9c17554ae8baa Mon Sep 17 00:00:00 2001 From: Ivan Tustanivskyi Date: Thu, 27 Jun 2024 15:25:16 +0300 Subject: [PATCH 3/3] Fix assertions being captured with native integration when using crash reporter (#586) * Fix assertion capturing when using crash reporter * Update changelog * Update CHANGELOG.md Co-authored-by: Stefan Jandl --------- Co-authored-by: Stefan Jandl --- CHANGELOG.md | 4 ++++ plugin-dev/Source/Sentry/Private/SentrySubsystem.cpp | 11 +++++++++++ 2 files changed, 15 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5702fde9..5254e274 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## Unreleased +### Fixes + +- The SDK no longer intercepts assertions when using crash-reporter ([#586](https://github.com/getsentry/sentry-unreal/pull/586)) + ### Dependencies - Bump Cocoa SDK (iOS) from v8.29.0 to v8.29.1 ([#580](https://github.com/getsentry/sentry-unreal/pull/580)) diff --git a/plugin-dev/Source/Sentry/Private/SentrySubsystem.cpp b/plugin-dev/Source/Sentry/Private/SentrySubsystem.cpp index 993d3dd8..c22ccbf0 100644 --- a/plugin-dev/Source/Sentry/Private/SentrySubsystem.cpp +++ b/plugin-dev/Source/Sentry/Private/SentrySubsystem.cpp @@ -120,7 +120,18 @@ void USentrySubsystem::Initialize() ConfigureBreadcrumbs(); ConfigureOutputDevice(); + +#if PLATFORM_WINDOWS + if (FEngineVersion::Current().GetMajor() == 5 && FEngineVersion::Current().GetMinor() >= 2) + { + if (Settings->EnableAutoCrashCapturing) + { + ConfigureOutputDeviceError(); + } + } +#else ConfigureOutputDeviceError(); +#endif FCoreDelegates::OnHandleSystemEnsure.AddLambda([this]() {