Merge branch 'main' into feat/anr-error

getsentry · Jun 27, 2024 · b2ad902 · b2ad902
2 parents 55985de + 283a465
commit b2ad902
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,11 +6,18 @@
 
 - Add API allowing to check if captured event is ANR error ([#581](https://github.com/getsentry/sentry-unreal/pull/581))
 
+### 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))
   - [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
diff --git 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)

diff --git 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]()
 	{