Fix crashpad handler path configuration in FAB pluging version (#1028)

* Fix crashpad handler path for fab

* Update changelog

Author: tustanivsky

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 ### Fixes
 
+- The FAB plugin version no longer opts out of Crashpad handler configuration ([#1028](https://github.com/getsentry/sentry-unreal/pull/1028))
 - The FAB version of the plugin builds successfully on Android and iOS ([#1027](https://github.com/getsentry/sentry-unreal/pull/1027))
 
 ## 1.0.0-beta.6

plugin-dev/Source/Sentry/Private/Microsoft/MicrosoftSentrySubsystem.cpp

@@ -38,21 +38,6 @@ void FMicrosoftSentrySubsystem::InitWithSettings(const USentrySettings* Settings
 #endif
 }
 
-void FMicrosoftSentrySubsystem::ConfigureHandlerPath(sentry_options_t* Options)
-{
-	if (!FSentryModule::Get().IsMarketplaceVersion())
-	{
-		const FString HandlerPath = GetHandlerPath();
-
-		if (!FPaths::FileExists(HandlerPath))
-		{
-			UE_LOG(LogSentrySdk, Log, TEXT("Crashpad executable couldn't be found so Breakpad will be used instead. Please make sure that the plugin was rebuilt to avoid initialization failure."));
-		}
-
-		sentry_options_set_handler_pathw(Options, *HandlerPath);
-	}
-}
-
 void FMicrosoftSentrySubsystem::ConfigureDatabasePath(sentry_options_t* Options)
 {
 	sentry_options_set_database_pathw(Options, *GetDatabasePath());

plugin-dev/Source/Sentry/Private/Microsoft/MicrosoftSentrySubsystem.h

@@ -14,7 +14,6 @@ class FMicrosoftSentrySubsystem : public FGenericPlatformSentrySubsystem
 	virtual void InitWithSettings(const USentrySettings* settings, USentryBeforeSendHandler* beforeSendHandler, USentryBeforeBreadcrumbHandler* beforeBreadcrumbHandler, USentryTraceSampler* traceSampler) override;
 
 protected:
-	virtual void ConfigureHandlerPath(sentry_options_t* Options) override;
 	virtual void ConfigureDatabasePath(sentry_options_t* Options) override;
 	virtual void ConfigureLogFileAttachment(sentry_options_t* Options) override;
 

plugin-dev/Source/Sentry/Private/Windows/WindowsSentrySubsystem.cpp

@@ -7,6 +7,7 @@
 #include "SentryDefines.h"
 
 #include "Misc/OutputDeviceRedirector.h"
+#include "Misc/Paths.h"
 #include "Windows/Infrastructure/WindowsSentryConverters.h"
 #include "Windows/WindowsPlatformStackWalk.h"
 
@@ -57,6 +58,19 @@ static void PrintCrashLog(const sentry_ucontext_t* uctx)
 #endif // !UE_VERSION_OLDER_THAN(5, 0, 0)
 }
 
+void FWindowsSentrySubsystem::ConfigureHandlerPath(sentry_options_t* Options)
+{
+	const FString HandlerPath = GetHandlerPath();
+
+	if (!FPaths::FileExists(HandlerPath))
+	{
+		UE_LOG(LogSentrySdk, Log, TEXT("Crashpad executable couldn't be found so Breakpad will be used instead. Please make sure that the plugin was rebuilt to avoid initialization failure."));
+		return;
+	}
+
+	sentry_options_set_handler_pathw(Options, *HandlerPath);
+}
+
 sentry_value_t FWindowsSentrySubsystem::OnCrash(const sentry_ucontext_t* uctx, sentry_value_t event, void* closure)
 {
 	// Ensures that error message and corresponding callstack flushed to a log file (if available)

plugin-dev/Source/Sentry/Private/Windows/WindowsSentrySubsystem.h

@@ -9,6 +9,8 @@
 class FWindowsSentrySubsystem : public FMicrosoftSentrySubsystem
 {
 protected:
+	virtual void ConfigureHandlerPath(sentry_options_t* Options) override;
+
 	virtual FString GetHandlerExecutableName() const override { return TEXT("crashpad_handler.exe"); }
 
 	virtual sentry_value_t OnCrash(const sentry_ucontext_t* uctx, sentry_value_t event, void* closure) override;