Update includes and returns in HAL to correctly support platform extensions (#806)

* Consolidate use of USE_SENTRY_NATIVE for GenericPlatform, and cleanup Build.cs

* Restore Build.cs but remove WriteLine about unsupported platform

* Ensure that use of HAL when returning nullptr includes the interface header

* Normalize tabs vs. spaces

* Actually normalize

* Update CHANGELOG

---------

Co-authored-by: Ivan Tustanivskyi <tustanivsky@gmail.com>

Author: nwhite-riot

CHANGELOG.md

@@ -8,6 +8,10 @@
   - [changelog](https://github.com/getsentry/sentry-native/blob/master/CHANGELOG.md#081)
   - [diff](https://github.com/getsentry/sentry-native/compare/0.8.0...0.8.1)
 
+### Internal
+
+- Update `include`s and `return`s in HAL to correctly support platform extensions ([#806](https://github.com/getsentry/sentry-unreal/pull/806))
+
 ## 1.0.0-alpha.1
 
 ### Breaking Changes

plugin-dev/Source/Sentry/Private/HAL/PlatformSentryAttachment.h

@@ -15,7 +15,7 @@ static TSharedPtr<ISentryAttachment> CreateSharedSentryAttachment(const FString&
 #elif PLATFORM_APPLE
 	return MakeShareable(new SentryAttachmentApple(Path, Filename, ContentType));
 #else
-	return MakeShareable(new FNullSentryAttachment());
+	return MakeShareable(new FNullSentryAttachment);
 #endif
 }
 
@@ -26,6 +26,6 @@ static TSharedPtr<ISentryAttachment> CreateSharedSentryAttachment(const TArray<u
 #elif PLATFORM_APPLE
 	return MakeShareable(new SentryAttachmentApple(Data, Filename, ContentType));
 #else
-	return MakeShareable(new FNullSentryAttachment());
+	return MakeShareable(new FNullSentryAttachment);
 #endif
 }

plugin-dev/Source/Sentry/Private/HAL/PlatformSentryBreadcrumb.h

@@ -6,6 +6,8 @@
 #include "Apple/SentryBreadcrumbApple.h"
 #elif USE_SENTRY_NATIVE
 #include "GenericPlatform/GenericPlatformSentryBreadcrumb.h"
+#else
+#include "Interface/SentryBreadcrumbInterface.h"
 #endif
 
 static TSharedPtr<ISentryBreadcrumb> CreateSharedSentryBreadcrumb()

plugin-dev/Source/Sentry/Private/HAL/PlatformSentryEvent.h

@@ -4,8 +4,10 @@
 #include "Android/SentryEventAndroid.h"
 #elif PLATFORM_APPLE
 #include "Apple/SentryEventApple.h"
-#else
+#elif USE_SENTRY_NATIVE
 #include "GenericPlatform/GenericPlatformSentryEvent.h"
+#else
+#include "Interface/SentryEventInterface.h"
 #endif
 
 static TSharedPtr<ISentryEvent> CreateSharedSentryEvent()
@@ -14,7 +16,9 @@ static TSharedPtr<ISentryEvent> CreateSharedSentryEvent()
 	return MakeShareable(new SentryEventAndroid);
 #elif PLATFORM_APPLE
 	return MakeShareable(new SentryEventApple);
-#else
+#elif USE_SENTRY_NATIVE
 	return MakeShareable(new FGenericPlatformSentryEvent);
+#else
+	return nullptr;
 #endif
 }

plugin-dev/Source/Sentry/Private/HAL/PlatformSentryHint.h

@@ -9,8 +9,8 @@
 static TSharedPtr<ISentryHint> CreateSharedSentryHint()
 {
 #if PLATFORM_ANDROID
-    return MakeShareable(new SentryHintAndroid);
+	return MakeShareable(new SentryHintAndroid);
 #else
-    return MakeShareable(new FNullSentryHint);
+	return MakeShareable(new FNullSentryHint);
 #endif
 }

plugin-dev/Source/Sentry/Private/HAL/PlatformSentryId.h

@@ -4,17 +4,21 @@
 #include "Android/SentryIdAndroid.h"
 #elif PLATFORM_APPLE
 #include "Apple/SentryIdApple.h"
-#else
+#elif USE_SENTRY_NATIVE
 #include "GenericPlatform/GenericPlatformSentryId.h"
+#else
+#include "Interface/SentryIdInterface.h"
 #endif
 
 static TSharedPtr<ISentryId> CreateSharedSentryId()
 {
 #if PLATFORM_ANDROID
-    return MakeShareable(new SentryIdAndroid);
+	return MakeShareable(new SentryIdAndroid);
 #elif PLATFORM_APPLE
-    return MakeShareable(new SentryIdApple);
+	return MakeShareable(new SentryIdApple);
+#elif USE_SENTRY_NATIVE
+	return MakeShareable(new FGenericPlatformSentryId);
 #else
-    return MakeShareable(new FGenericPlatformSentryId);
+	return nullptr;
 #endif
 }

plugin-dev/Source/Sentry/Private/HAL/PlatformSentrySamplingContext.h

@@ -4,7 +4,7 @@
 
 static TSharedPtr<ISentrySamplingContext> CreateSharedSentrySamplingContext()
 {
-    // Sampling context is supposed to be created internally by the SDK using the platform-specific implementations.
-    // Currently, it doesn't provide default constructor for Apple/Android thus we can only return Null-version here.
-    return MakeShareable(new FNullSentrySamplingContext);
+	// Sampling context is supposed to be created internally by the SDK using the platform-specific implementations.
+	// Currently, it doesn't provide default constructor for Apple/Android thus we can only return Null-version here.
+	return MakeShareable(new FNullSentrySamplingContext);
 }

plugin-dev/Source/Sentry/Private/HAL/PlatformSentryScope.h

@@ -4,17 +4,21 @@
 #include "Android/SentryScopeAndroid.h"
 #elif PLATFORM_APPLE
 #include "Apple/SentryScopeApple.h"
-#else
+#elif USE_SENTRY_NATIVE
 #include "GenericPlatform/GenericPlatformSentryScope.h"
+#else
+#include "Interface/SentryScopeInterface.h"
 #endif
 
 static TSharedPtr<ISentryScope> CreateSharedSentryScope()
 {
 #if PLATFORM_ANDROID
-    return MakeShareable(new SentryScopeAndroid);
+	return MakeShareable(new SentryScopeAndroid);
 #elif PLATFORM_APPLE
-    return MakeShareable(new SentryScopeApple);
+	return MakeShareable(new SentryScopeApple);
+#elif USE_SENTRY_NATIVE
+	return MakeShareable(new FGenericPlatformSentryScope);
 #else
-    return MakeShareable(new FGenericPlatformSentryScope);
+	return nullptr;
 #endif
 }

plugin-dev/Source/Sentry/Private/HAL/PlatformSentrySpan.h

@@ -4,8 +4,10 @@
 #include "Android/SentrySpanAndroid.h"
 #elif PLATFORM_APPLE
 #include "Apple/SentrySpanApple.h"
-#else
+#elif USE_SENTRY_NATIVE
 #include "GenericPlatform/GenericPlatformSentrySpan.h"
+#else
+#include "Interface/SentrySpanInterface.h"
 #endif
 
 static TSharedPtr<ISentrySpan> CreateSharedSentrySpan(const FString& Name, const FString& Operation)
@@ -14,7 +16,9 @@ static TSharedPtr<ISentrySpan> CreateSharedSentrySpan(const FString& Name, const
 	return MakeShareable(new SentrySpanAndroid);
 #elif PLATFORM_APPLE
 	return MakeShareable(new SentrySpanApple);
-#else
+#elif USE_SENTRY_NATIVE
 	return MakeShareable(new FGenericPlatformSentrySpan);
+#else
+	return nullptr;
 #endif
 }

plugin-dev/Source/Sentry/Private/HAL/PlatformSentryTransaction.h

@@ -4,17 +4,21 @@
 #include "Android/SentryTransactionAndroid.h"
 #elif PLATFORM_APPLE
 #include "Apple/SentryTransactionApple.h"
-#else
+#elif USE_SENTRY_NATIVE
 #include "GenericPlatform/GenericPlatformSentryTransaction.h"
+#else
+#include "Interface/SentryTransactionInterface.h"
 #endif
 
 static TSharedPtr<ISentryTransaction> CreateSharedSentryTransaction()
 {
 #if PLATFORM_ANDROID
-    return MakeShareable(new SentryTransactionAndroid);
+	return MakeShareable(new SentryTransactionAndroid);
 #elif PLATFORM_APPLE
-    return MakeShareable(new SentryTransactionApple);
+	return MakeShareable(new SentryTransactionApple);
+#elif USE_SENTRY_NATIVE
+	return MakeShareable(new FGenericPlatformSentryTransaction);
 #else
-    return MakeShareable(new FGenericPlatformSentryTransaction);
+	return nullptr;
 #endif
 }

plugin-dev/Source/Sentry/Private/HAL/PlatformSentryTransactionContext.h

@@ -4,8 +4,10 @@
 #include "Android/SentryTransactionContextAndroid.h"
 #elif PLATFORM_APPLE
 #include "Apple/SentryTransactionContextApple.h"
-#else
+#elif USE_SENTRY_NATIVE
 #include "GenericPlatform/GenericPlatformSentryTransactionContext.h"
+#else
+#include "Interface/SentryTransactionContextInterface.h"
 #endif
 
 static TSharedPtr<ISentryTransactionContext> CreateSharedSentryTransactionContext(const FString& Name, const FString& Operation)
@@ -14,7 +16,9 @@ static TSharedPtr<ISentryTransactionContext> CreateSharedSentryTransactionContex
 	return MakeShareable(new SentryTransactionContextAndroid(Name, Operation));
 #elif PLATFORM_APPLE
 	return MakeShareable(new SentryTransactionContextApple(Name, Operation));
-#else
+#elif USE_SENTRY_NATIVE
 	return MakeShareable(new FGenericPlatformSentryTransactionContext(Name, Operation));
+#else
+	return nullptr;
 #endif
 }

plugin-dev/Source/Sentry/Private/HAL/PlatformSentryUser.h

@@ -4,8 +4,10 @@
 #include "Android/SentryUserAndroid.h"
 #elif PLATFORM_APPLE
 #include "Apple/SentryUserApple.h"
-#else
+#elif USE_SENTRY_NATIVE
 #include "GenericPlatform/GenericPlatformSentryUser.h"
+#else
+#include "Interface/SentryUserInterface.h"
 #endif
 
 static TSharedPtr<ISentryUser> CreateSharedSentryUser()
@@ -14,7 +16,9 @@ static TSharedPtr<ISentryUser> CreateSharedSentryUser()
 	return MakeShareable(new SentryUserAndroid);
 #elif PLATFORM_APPLE
 	return MakeShareable(new SentryUserApple);
-#else
+#elif USE_SENTRY_NATIVE
 	return MakeShareable(new FGenericPlatformSentryUser);
+#else
+	return nullptr;
 #endif
 }

plugin-dev/Source/Sentry/Private/HAL/PlatformSentryUserFeedback.h

@@ -4,8 +4,10 @@
 #include "Android/SentryUserFeedbackAndroid.h"
 #elif PLATFORM_APPLE
 #include "Apple/SentryUserFeedbackApple.h"
-#else
+#elif USE_SENTRY_NATIVE
 #include "GenericPlatform/GenericPlatformSentryUserFeedback.h"
+#else
+#include "Interface/SentryUserFeedbackInterface.h"
 #endif
 
 static TSharedPtr<ISentryUserFeedback> CreateSharedSentryUserFeedback(TSharedPtr<ISentryId> EventId)
@@ -14,7 +16,9 @@ static TSharedPtr<ISentryUserFeedback> CreateSharedSentryUserFeedback(TSharedPtr
 	return MakeShareable(new SentryUserFeedbackAndroid(EventId));
 #elif PLATFORM_APPLE
 	return MakeShareable(new SentryUserFeedbackApple(EventId));
-#else
+#elif USE_SENTRY_NATIVE
 	return MakeShareable(new FGenericPlatformSentryUserFeedback(EventId));
+#else
+	return nullptr;
 #endif
 }

plugin-dev/Source/Sentry/Sentry.Build.cs

@@ -160,9 +160,5 @@ public Sentry(ReadOnlyTargetRules Target) : base(Target)
 
 			AddEngineThirdPartyPrivateStaticDependencies(Target, "libcurl");
 		}
-		else
-		{
-			Console.WriteLine("Sentry Unreal SDK does not support platform: " + Target.Platform);
-		}
 	}
 }