Update cocoa class loading for Mac

Author: tustanivsky

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

@@ -7,20 +7,12 @@
 
 FAppleSentryId::FAppleSentryId()
 {
-#if PLATFORM_MAC
-	IdApple = [[SENTRY_APPLE_CLASS(_TtC6Sentry8SentryId) alloc] init];
-#elif PLATFORM_IOS
 	IdApple = [[SENTRY_APPLE_CLASS(SentryId) alloc] init];
-#endif
 }
 
 FAppleSentryId::FAppleSentryId(const FString& id)
 {
-#if PLATFORM_MAC
-	IdApple = [[SENTRY_APPLE_CLASS(_TtC6Sentry8SentryId) alloc] initWithUUIDString:id.GetNSString()];
-#elif PLATFORM_IOS
 	IdApple = [[SENTRY_APPLE_CLASS(SentryId) alloc] initWithUUIDString:id.GetNSString()];
-#endif
 }
 
 FAppleSentryId::FAppleSentryId(SentryId* id)

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

@@ -395,11 +395,7 @@ TSharedPtr<ISentryTransactionContext> FAppleSentrySubsystem::ContinueTrace(const
 		sampleDecision = traceParts[2].Equals(TEXT("1")) ? kSentrySampleDecisionYes : kSentrySampleDecisionNo;
 	}
 
-#if PLATFORM_MAC
-	SentryId* traceId = [[SENTRY_APPLE_CLASS(_TtC6Sentry8SentryId) alloc] initWithUUIDString:traceParts[0].GetNSString()];
-#elif PLATFORM_IOS
 	SentryId* traceId = [[SENTRY_APPLE_CLASS(SentryId) alloc] initWithUUIDString:traceParts[0].GetNSString()];
-#endif
 
 	SentryTransactionContext* transactionContext = [[SENTRY_APPLE_CLASS(SentryTransactionContext) alloc] initWithName:@"<unlabeled transaction>" operation:@"default"
 																											  traceId:traceId

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

@@ -13,21 +13,12 @@ FAppleSentryUserFeedback::FAppleSentryUserFeedback(TSharedPtr<ISentryId> eventId
 	TSharedPtr<FAppleSentryId> idIOS = StaticCastSharedPtr<FAppleSentryId>(eventId);
 	SentryId* id = idIOS->GetNativeObject();
 
-#if PLATFORM_MAC
-	UserFeedbackApple = [[SENTRY_APPLE_CLASS(_TtC6Sentry14SentryFeedback) alloc] initWithMessage:@""
-																							name:nil
-																						   email:nil
-																						  source:SentryFeedbackSourceCustom
-																			   associatedEventId:id
-																					 attachments:nil];
-#elif PLATFORM_IOS
 	UserFeedbackApple = [[SENTRY_APPLE_CLASS(SentryFeedback) alloc] initWithMessage:@""
 																			   name:nil
 																			  email:nil
 																			 source:SentryFeedbackSourceCustom
 																  associatedEventId:id
 																		attachments:nil];
-#endif
 }
 
 FAppleSentryUserFeedback::~FAppleSentryUserFeedback()
@@ -80,19 +71,10 @@ SentryFeedback* FAppleSentryUserFeedback::CreateSentryFeedback(TSharedPtr<FApple
 	TSharedPtr<FAppleSentryId> idIOS = StaticCastSharedPtr<FAppleSentryId>(feedback->EventId);
 	SentryId* id = idIOS->GetNativeObject();
 
-#if PLATFORM_MAC
-	return [[SENTRY_APPLE_CLASS(_TtC6Sentry14SentryFeedback) alloc] initWithMessage:feedback->Comment.GetNSString()
-																			   name:feedback->Name.GetNSString()
-																			  email:feedback->Email.GetNSString()
-																			 source:SentryFeedbackSourceCustom
-																  associatedEventId:id
-																		attachments:nil];
-#elif PLATFORM_IOS
 	return [[SENTRY_APPLE_CLASS(SentryFeedback) alloc] initWithMessage:feedback->Comment.GetNSString()
 																  name:feedback->Name.GetNSString()
 																 email:feedback->Email.GetNSString()
 																source:SentryFeedbackSourceCustom
 													 associatedEventId:id
 														   attachments:nil];
-#endif
 }

plugin-dev/Source/Sentry/Private/Apple/Convenience/AppleSentryMacro.h

@@ -8,7 +8,7 @@
 
 #if PLATFORM_MAC
 	#define SENTRY_APPLE_CLASS(Name) \
-		(__bridge Class) dlsym(FSentryModule::Get().GetSentryLibHandle(), "OBJC_CLASS_$_" #Name)
+		FSentryModule::Get().GetSentryCocoaClass(#Name)
 #elif PLATFORM_IOS
 	#define SENTRY_APPLE_CLASS(Name) \
 		Name

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

@@ -128,10 +128,30 @@ bool FSentryModule::IsMarketplaceVersion()
 }
 
 #if PLATFORM_MAC
+
 void* FSentryModule::GetSentryLibHandle() const
 {
 	return mDllHandleSentry;
 }
+
+Class FSentryModule::GetSentryCocoaClass(const ANSICHAR* ClassName)
+{
+	ANSICHAR ClassNamePattern[256];
+	FCStringAnsi::Snprintf(ClassNamePattern, sizeof(ClassNamePattern), "OBJC_CLASS_$_%s", ClassName);
+	Class FoundClass = (__bridge Class) dlsym(GetSentryLibHandle(), ClassNamePattern);
+
+	if (!FoundClass) 
+	{
+		// Try to load with Swift mangled class name
+		ANSICHAR MangledClassNamePattern[256];
+		int32 ClassNameLen = FCStringAnsi::Strlen(ClassName);
+		FCStringAnsi::Snprintf(MangledClassNamePattern, sizeof(MangledClassNamePattern), "OBJC_CLASS_$__TtC6Sentry%d%s", ClassNameLen, ClassName);
+		FoundClass = (__bridge Class) dlsym(GetSentryLibHandle(), MangledClassNamePattern);
+	}
+
+	return FoundClass;
+}
+
 #endif
 
 #undef LOCTEXT_NAMESPACE

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

@@ -47,6 +47,19 @@ class SENTRY_API FSentryModule : public IModuleInterface
 #if PLATFORM_MAC
 	/** Gets handle to dynamically loaded sentry library. */
 	void* GetSentryLibHandle() const;
+
+	/** Gets an Objective-C/Swift class from the dynamically loaded sentry library.
+	 *
+	 * @param ClassName The unqualified class name (e.g., "SentrySDK", "SentryId")
+	 * @return The Objective-C/Swift Class object if found, nil otherwise
+	 *
+	 * @note: First tries pattern OBJC_CLASS_$_{ClassName}
+	 * Then tries Swift mangled pattern OBJC_CLASS_$__TtC6Sentry{len}{ClassName} where:
+	 * `_Tt` is Swift type symbol prefix
+	 * `C6Sentry` is a class (`C`) in the Sentry module (`6Sentry` means the module name is 6 characters long)
+	 * {len} is the length of the class name as a decimal string
+	 */
+	Class GetSentryCocoaClass(const ANSICHAR* ClassName);
 #endif
 
 	static const FName ModuleName;