Use explicit name

Author: noahsmartin

Sources/Sentry/SentryHub.m

@@ -630,10 +630,10 @@ - (BOOL)isIntegrationInstalled:(Class)integrationClass
     }
 }
 
-- (nullable id)getInstalledIntegration:(Class)integrationClass
+- (nullable id<SentryBaseIntegrationProtocol>)getInstalledIntegration:(Class)integrationClass
 {
     @synchronized(_integrationsLock) {
-        for (id item in _installedIntegrations) {
+        for (id<SentryBaseIntegrationProtocol> item in _installedIntegrations) {
             if ([item isKindOfClass:integrationClass]) {
                 return item;
             }
@@ -651,7 +651,7 @@ - (BOOL)hasIntegration:(NSString *)integrationName
     }
 }
 
-- (void)addInstalledIntegration:(id)integration name:(NSString *)name
+- (void)addInstalledIntegration:(id<SentryBaseIntegrationProtocol>)integration name:(NSString *)name
 {
     @synchronized(_integrationsLock) {
         [_installedIntegrations addObject:integration];
@@ -894,8 +894,8 @@ - (void)captureLog:(SentryLog *)log
 #if SENTRY_TARGET_REPLAY_SUPPORTED
 - (NSString *__nullable)getSessionReplayId
 {
-    SentrySessionReplayIntegration *integration =
-        [self getInstalledIntegration:[SentrySessionReplayIntegration class]];
+    SentrySessionReplayIntegration *integration = (SentrySessionReplayIntegration *)[self
+        getInstalledIntegration:[SentrySessionReplayIntegration class]];
     if (integration == nil || integration.sessionReplay == nil) {
         return nil;
     }

Sources/Sentry/include/SentryHub+Private.h

@@ -86,7 +86,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)registerSessionListener:(id<SentrySessionListener>)listener;
 - (void)unregisterSessionListener:(id<SentrySessionListener>)listener;
-- (nullable id)getInstalledIntegration:(Class)integrationClass;
+- (nullable id<SentryBaseIntegrationProtocol>)getInstalledIntegration:(Class)integrationClass;
 - (NSSet<NSString *> *)installedIntegrationNames;
 
 #if SENTRY_TARGET_REPLAY_SUPPORTED

Sources/Sentry/include/SentryIntegrationProtocol.h

@@ -0,0 +1 @@
+HybridPublic/SentryIntegrationProtocol.h

Sources/Sentry/include/SentryPrivate.h

@@ -22,6 +22,10 @@
 #import "SentryEnvelopeAttachmentHeader.h"
 #import "SentryEventSwiftHelper.h"
 #import "SentryHub+Private.h"
+// In SPM the file needs to be in the "include" directory since that is
+// the Public headers directory, but in Cocoapods it must be in HybridPublic because it is used in
+// that public interface too. In order to handle both these cases the file is in HybridPublic but
+// symlinked to include.
 #import "SentryIntegrationProtocol.h"
 #import "SentryNSDataUtils.h"
 #import "SentrySDK+Private.h"

Sources/Swift/Core/Integrations/Integrations.swift

@@ -9,6 +9,9 @@ protocol Integration: SentryBaseIntegrationProtocol {
 
     // The initializer is failable, return nil if the integration was not installed, for example when the options that enable the integration is not enabled.
     init?(with options: Options, dependencies: Dependencies)
+    
+    // Name of the integration that is used by `SentrySdkInfo`
+    static var name: String { get }
 }
 
 // Type erases the `Integration` so that it can be stored in an array and used for `addInstalledIntegration`
@@ -17,7 +20,7 @@ private struct AnyIntegration {
     let name: String
 
     init<I: Integration>(_ integration: I.Type) where I.Dependencies == SentryDependencyContainer {
-        name = NSStringFromClass(I.self)
+        name = I.name
         start = {
             integration.init(with: $0, dependencies: $1)
         }

Sources/Swift/Integrations/UserFeedback/UserFeedbackIntegration.swift

@@ -27,6 +27,10 @@ final class UserFeedbackIntegration<Dependencies: ScreenshotSourceProvider>: NSO
     }
 
     func uninstall() { }
+    
+    static var name: String {
+        "SentryUserFeedbackIntegration"
+    }
 }
 
 #endif