ref: DSN resolution during the plugin initialization (#985)

* Refactor DSN resolution during the SDK init (default vs editor)

* Move EditorDSN setting to Misc section

* Fix lint errors

Author: tustanivsky

plugin-dev/Source/Sentry/Private/Apple/AppleSentrySubsystem.cpp

@@ -48,13 +48,7 @@ void FAppleSentrySubsystem::InitWithSettings(const USentrySettings* settings, US
 	dispatch_group_enter(sentryDispatchGroup);
 	dispatch_async(dispatch_get_main_queue(), ^{
 		[SentrySDK startWithConfigureOptions:^(SentryOptions* options) {
-			options.dsn = settings->Dsn.GetNSString();
-#if WITH_EDITOR
-			if (!settings->EditorDsn.IsEmpty())
-			{
-				options.dsn = settings->EditorDsn.GetNSString();
-			}
-#endif
+			options.dsn = settings->GetEffectiveDsn().GetNSString();
 			options.environment = settings->Environment.GetNSString();
 			options.dist = settings->Dist.GetNSString();
 			options.enableAutoSessionTracking = settings->EnableAutoSessionTracking;

plugin-dev/Source/Sentry/Private/GenericPlatform/GenericPlatformSentrySubsystem.cpp

@@ -276,13 +276,8 @@ void FGenericPlatformSentrySubsystem::InitWithSettings(const USentrySettings* se
 
 	sentry_options_set_release(options, TCHAR_TO_ANSI(settings->OverrideReleaseName ? *settings->Release : *settings->GetFormattedReleaseName()));
 
-	sentry_options_set_dsn(options, TCHAR_TO_ANSI(*settings->Dsn));
-#if WITH_EDITOR
-	if (!settings->EditorDsn.IsEmpty())
-	{
-		sentry_options_set_dsn(options, TCHAR_TO_ANSI(*settings->EditorDsn));
-	}
-#endif // WITH_EDITOR
+	sentry_options_set_dsn(options, TCHAR_TO_ANSI(*settings->GetEffectiveDsn()));
+
 	sentry_options_set_environment(options, TCHAR_TO_ANSI(*settings->Environment));
 	sentry_options_set_dist(options, TCHAR_TO_ANSI(*settings->Dist));
 	sentry_options_set_logger(options, PrintVerboseLog, nullptr);

plugin-dev/Source/Sentry/Private/SentrySettings.cpp

@@ -13,7 +13,6 @@ USentrySettings::USentrySettings(const FObjectInitializer& ObjectInitializer)
 	: Super(ObjectInitializer)
 	, InitAutomatically(true)
 	, Dsn()
-	, EditorDsn()
 	, Debug(true)
 	, Environment(GetDefaultEnvironmentName())
 	, SampleRate(1.0f)
@@ -39,6 +38,7 @@ USentrySettings::USentrySettings(const FObjectInitializer& ObjectInitializer)
 	, SamplingType(ESentryTracesSamplingType::UniformSampleRate)
 	, TracesSampleRate(0.0f)
 	, TracesSampler(USentryTraceSampler::StaticClass())
+	, EditorDsn()
 	, EnableForPromotedBuildsOnly(false)
 	, UploadSymbolsAutomatically(false)
 	, IncludeSources(false)
@@ -84,6 +84,11 @@ void USentrySettings::PostEditChangeProperty(FPropertyChangedEvent& PropertyChan
 
 #endif
 
+FString USentrySettings::GetEffectiveDsn() const
+{
+	return GIsEditor && !EditorDsn.IsEmpty() ? EditorDsn : Dsn;
+}
+
 FString USentrySettings::GetFormattedReleaseName()
 {
 	FString FormattedReleaseName = FApp::GetProjectName();

plugin-dev/Source/Sentry/Public/SentrySettings.h

@@ -189,10 +189,6 @@ class SENTRY_API USentrySettings : public UObject
 		Meta = (DisplayName = "DSN", ToolTip = "The DSN (Data Source Name) tells the SDK where to send the events to. Get your DSN in the Sentry dashboard."))
 	FString Dsn;
 
-	UPROPERTY(Config, EditAnywhere, BlueprintReadWrite, Category = "General",
-		Meta = (DisplayName = "Editor DSN", ToolTip = "The Editor DSN (Data Source Name) if you want to isolate editor crashes from packaged game crashes, defaults to Dsn if not provided."))
-	FString EditorDsn;
-
 	UPROPERTY(Config, EditAnywhere, Category = "General",
 		Meta = (DisplayName = "Enable verbose logging", ToolTip = "Flag indicating whether to enable verbose logging."))
 	bool Debug;
@@ -319,6 +315,10 @@ class SENTRY_API USentrySettings : public UObject
 			EditCondition = "EnableTracing && SamplingType == ESentryTracesSamplingType::TracesSampler", EditConditionHides))
 	TSubclassOf<USentryTraceSampler> TracesSampler;
 
+	UPROPERTY(Config, EditAnywhere, BlueprintReadWrite, Category = "General|Misc",
+		Meta = (DisplayName = "Editor DSN", ToolTip = "The Editor DSN (Data Source Name) if you want to isolate editor crashes from packaged game crashes, defaults to Dsn if not provided."))
+	FString EditorDsn;
+
 	UPROPERTY(Config, EditAnywhere, BlueprintReadWrite, Category = "General|Misc",
 		Meta = (DisplayName = "Promote values to tags"))
 	FTagsPromotion TagsPromotion;
@@ -372,6 +372,13 @@ class SENTRY_API USentrySettings : public UObject
 	virtual void PostEditChangeProperty(FPropertyChangedEvent& PropertyChangedEvent) override;
 #endif
 
+	/**
+	 * Gets the effective DSN based on current execution context.
+	 *
+	 * @return Editor DSN when running in the editor and one is set; otherwise, falls back to the default DSN.
+	 */
+	FString GetEffectiveDsn() const;
+
 	static FString GetFormattedReleaseName();
 
 	bool IsDirty() const;