Merge 3f475f9 into 9ef729b

Sources/Sentry/PrivateSentrySDKOnly.m

@@ -10,6 +10,7 @@
 #import "SentryViewHierarchy.h"
 #import <SentryDependencyContainer.h>
 #import <SentryFramesTracker.h>
+#import <SentryOptions.h>
 #import <SentryScreenshot.h>
 
 @implementation PrivateSentrySDKOnly

Sources/Sentry/Public/SentryHub.h

@@ -1,5 +1,4 @@
 #import "SentryDefines.h"
-#import "SentryIntegrationProtocol.h"
 #import "SentrySpanProtocol.h"
 
 @class SentryEvent, SentryClient, SentryScope, SentryUser, SentryBreadcrumb, SentryId,

Sources/Sentry/Public/SentryIntegrationProtocol.h

@@ -1,14 +1,14 @@
+#import "SentryDefines.h"
 #import <Foundation/Foundation.h>
 
-#import "SentryDefines.h"
-#import "SentryOptions.h"
+@class SentryOptions;
 
 NS_ASSUME_NONNULL_BEGIN
 
 @protocol SentryIntegrationProtocol <NSObject>
 
 /**
- * Installs the integration and returns YES if successful.
+ * Installs the integration and returns @c YES if successful.
  */
 - (BOOL)installWithOptions:(SentryOptions *)options;
 

Sources/Sentry/SentryHub.m

@@ -1,4 +1,5 @@
 #import "SentryHub.h"
+#import "SentryBaseIntegration.h"
 #import "SentryClient+Private.h"
 #import "SentryCrashWrapper.h"
 #import "SentryCurrentDateProvider.h"
@@ -36,7 +37,7 @@
 @property (nonatomic, strong) SentryTracesSampler *tracesSampler;
 @property (nonatomic, strong) SentryProfilesSampler *profilesSampler;
 @property (nonatomic, strong) id<SentryCurrentDateProvider> currentDateProvider;
-@property (nonatomic, strong) NSMutableArray<id<SentryIntegrationProtocol>> *installedIntegrations;
+@property (nonatomic, strong) NSMutableArray<SentryBaseIntegration *> *installedIntegrations;
 @property (nonatomic, strong) NSMutableSet<NSString *> *installedIntegrationNames;
 @property (nonatomic) NSUInteger errorsBeforeSession;
 
@@ -519,7 +520,7 @@ - (void)configureScope:(void (^)(SentryScope *scope))callback
 - (BOOL)isIntegrationInstalled:(Class)integrationClass
 {
     @synchronized(_integrationsLock) {
-        for (id<SentryIntegrationProtocol> item in _installedIntegrations) {
+        for (SentryBaseIntegration *item in _installedIntegrations) {
             if ([item isKindOfClass:integrationClass]) {
                 return YES;
             }
@@ -537,7 +538,7 @@ - (BOOL)hasIntegration:(NSString *)integrationName
     }
 }
 
-- (void)addInstalledIntegration:(id<SentryIntegrationProtocol>)integration name:(NSString *)name
+- (void)addInstalledIntegration:(SentryBaseIntegration *)integration name:(NSString *)name
 {
     @synchronized(_integrationsLock) {
         [_installedIntegrations addObject:integration];
@@ -553,7 +554,7 @@ - (void)removeAllIntegrations
     }
 }
 
-- (NSArray<id<SentryIntegrationProtocol>> *)installedIntegrations
+- (NSArray<SentryBaseIntegration *> *)installedIntegrations
 {
     @synchronized(_integrationsLock) {
         return _installedIntegrations.copy;

Sources/Sentry/SentryNSURLRequest.m

@@ -7,6 +7,7 @@
 #import "SentryHub.h"
 #import "SentryLog.h"
 #import "SentryMeta.h"
+#import "SentryOptions.h"
 #import "SentrySDK+Private.h"
 #import "SentrySerialization.h"
 

Sources/Sentry/SentryNetworkTracker.m

@@ -10,6 +10,7 @@
 #import "SentryLog.h"
 #import "SentryMechanism.h"
 #import "SentryNoOpSpan.h"
+#import "SentryOptions.h"
 #import "SentryRequest.h"
 #import "SentrySDK+Private.h"
 #import "SentryScope+Private.h"

Sources/Sentry/SentryProfiler.mm

@@ -22,6 +22,7 @@
 #    import "SentryMetricProfiler.h"
 #    import "SentryNSProcessInfoWrapper.h"
 #    import "SentryNSTimerWrapper.h"
+#    import "SentryOptions.h"
 #    import "SentryProfileTimeseries.h"
 #    import "SentrySamplingProfiler.hpp"
 #    import "SentryScope+Private.h"

Sources/Sentry/SentryRequestOperation.m

@@ -3,6 +3,7 @@
 #import "SentryError.h"
 #import "SentryHub.h"
 #import "SentryLog.h"
+#import "SentryOptions.h"
 #import "SentrySDK+Private.h"
 
 NS_ASSUME_NONNULL_BEGIN

Sources/Sentry/SentrySDK.m

@@ -2,6 +2,7 @@
 #import "PrivateSentrySDKOnly.h"
 #import "SentryAppStartMeasurement.h"
 #import "SentryAppStateManager.h"
+#import "SentryBaseIntegration.h"
 #import "SentryBreadcrumb.h"
 #import "SentryClient+Private.h"
 #import "SentryCrash.h"
@@ -350,7 +351,7 @@ + (void)installIntegrations
                 integrationName);
             continue;
         }
-        id<SentryIntegrationProtocol> integrationInstance = [[integrationClass alloc] init];
+        SentryBaseIntegration *integrationInstance = [[integrationClass alloc] init];
         BOOL shouldInstall = [integrationInstance installWithOptions:options];
 
         if (shouldInstall) {

Sources/Sentry/SentrySessionTracker.m

@@ -6,6 +6,7 @@
 #import "SentryInternalNotificationNames.h"
 #import "SentryLog.h"
 #import "SentryNSNotificationCenterWrapper.h"
+#import "SentryOptions.h"
 #import "SentrySDK+Private.h"
 
 #if SENTRY_HAS_UIKIT

Sources/Sentry/SentryUIViewControllerPerformanceTracker.m

@@ -2,6 +2,7 @@
 #import "SentryFramesTracker.h"
 #import "SentryHub.h"
 #import "SentryLog.h"
+#import "SentryOptions.h"
 #import "SentryPerformanceTracker.h"
 #import "SentrySDK+Private.h"
 #import "SentryScope.h"

Sources/Sentry/include/SentryANRTrackingIntegration.h

@@ -1,12 +1,10 @@
 #import "SentryANRTracker.h"
 #import "SentryBaseIntegration.h"
-#import "SentryIntegrationProtocol.h"
 #import <Foundation/Foundation.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface SentryANRTrackingIntegration
-    : SentryBaseIntegration <SentryIntegrationProtocol, SentryANRTrackerDelegate>
+@interface SentryANRTrackingIntegration : SentryBaseIntegration <SentryANRTrackerDelegate>
 
 @end
 

Sources/Sentry/include/SentryAppStartTrackingIntegration.h

@@ -1,13 +1,12 @@
 #import "SentryBaseIntegration.h"
-#import "SentryIntegrationProtocol.h"
 #import <Foundation/Foundation.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
 /**
  * Tracks cold and warm app start time for iOS, tvOS, and Mac Catalyst.
  */
-@interface SentryAppStartTrackingIntegration : SentryBaseIntegration <SentryIntegrationProtocol>
+@interface SentryAppStartTrackingIntegration : SentryBaseIntegration
 
 - (void)stop;
 

Sources/Sentry/include/SentryAutoBreadcrumbTrackingIntegration.h

@@ -1,14 +1,13 @@
 #import "SentryBaseIntegration.h"
 #import "SentryBreadcrumbDelegate.h"
-#import "SentryIntegrationProtocol.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
 /**
  * This automatically adds breadcrumbs for different user actions.
  */
 @interface SentryAutoBreadcrumbTrackingIntegration
-    : SentryBaseIntegration <SentryIntegrationProtocol, SentryBreadcrumbDelegate>
+    : SentryBaseIntegration <SentryBreadcrumbDelegate>
 
 @end
 

Sources/Sentry/include/SentryAutoSessionTrackingIntegration.h

@@ -1,13 +1,12 @@
 #import "SentryBaseIntegration.h"
-#import "SentryIntegrationProtocol.h"
 #import <Foundation/Foundation.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
 /**
  * Automatically tracks session start and end.
  */
-@interface SentryAutoSessionTrackingIntegration : SentryBaseIntegration <SentryIntegrationProtocol>
+@interface SentryAutoSessionTrackingIntegration : SentryBaseIntegration
 
 - (void)stop;
 

Sources/Sentry/include/SentryBaseIntegration.h

@@ -1,3 +1,4 @@
+#import "SentryIntegrationProtocol.h"
 #import "SentryOptions.h"
 #import <Foundation/Foundation.h>
 
@@ -25,7 +26,7 @@ typedef NS_OPTIONS(NSUInteger, SentryIntegrationOption) {
     kIntegrationOptionEnableMetricKit = 1 << 17,
 };
 
-@interface SentryBaseIntegration : NSObject
+@interface SentryBaseIntegration : NSObject <SentryIntegrationProtocol>
 
 - (NSString *)integrationName;
 - (BOOL)installWithOptions:(SentryOptions *)options;

Sources/Sentry/include/SentryCoreDataTrackingIntegration.h

@@ -1,9 +1,8 @@
 #import "SentryBaseIntegration.h"
-#import "SentryIntegrationProtocol.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface SentryCoreDataTrackingIntegration : SentryBaseIntegration <SentryIntegrationProtocol>
+@interface SentryCoreDataTrackingIntegration : SentryBaseIntegration
 
 @end
 

Sources/Sentry/include/SentryCrashIntegration.h

@@ -1,5 +1,4 @@
 #import "SentryBaseIntegration.h"
-#import "SentryIntegrationProtocol.h"
 #import <Foundation/Foundation.h>
 
 NS_ASSUME_NONNULL_BEGIN
@@ -9,7 +8,7 @@ NS_ASSUME_NONNULL_BEGIN
 static NSString *const SentryDeviceContextFreeMemoryKey = @"free_memory";
 static NSString *const SentryDeviceContextAppMemoryKey = @"app_memory";
 
-@interface SentryCrashIntegration : SentryBaseIntegration <SentryIntegrationProtocol>
+@interface SentryCrashIntegration : SentryBaseIntegration
 
 + (void)enrichScope:(SentryScope *)scope crashWrapper:(SentryCrashWrapper *)crashWrapper;
 

Sources/Sentry/include/SentryFileIOTrackingIntegration.h

@@ -1,9 +1,8 @@
 #import "SentryBaseIntegration.h"
-#import "SentryIntegrationProtocol.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface SentryFileIOTrackingIntegration : SentryBaseIntegration <SentryIntegrationProtocol>
+@interface SentryFileIOTrackingIntegration : SentryBaseIntegration
 
 @end
 

Sources/Sentry/include/SentryFramesTrackingIntegration.h

@@ -1,10 +1,9 @@
 #import "SentryBaseIntegration.h"
-#import "SentryIntegrationProtocol.h"
 #import <Foundation/Foundation.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface SentryFramesTrackingIntegration : SentryBaseIntegration <SentryIntegrationProtocol>
+@interface SentryFramesTrackingIntegration : SentryBaseIntegration
 
 - (void)stop;
 

Sources/Sentry/include/SentryHub+Private.h

@@ -2,17 +2,17 @@
 #import "SentryTracer.h"
 
 @class SentryEnvelopeItem, SentryId, SentryScope, SentryTransaction, SentryDispatchQueueWrapper,
-    SentryEnvelope, SentryNSTimerWrapper;
+    SentryEnvelope, SentryNSTimerWrapper, SentryBaseIntegration;
 
 NS_ASSUME_NONNULL_BEGIN
 
 @interface
 SentryHub (Private)
 
-@property (nonatomic, strong) NSArray<id<SentryIntegrationProtocol>> *installedIntegrations;
+@property (nonatomic, strong) NSArray<SentryBaseIntegration *> *installedIntegrations;
 @property (nonatomic, strong) NSSet<NSString *> *installedIntegrationNames;
 
-- (void)addInstalledIntegration:(id<SentryIntegrationProtocol>)integration name:(NSString *)name;
+- (void)addInstalledIntegration:(SentryBaseIntegration *)integration name:(NSString *)name;
 - (void)removeAllIntegrations;
 
 - (SentryClient *_Nullable)client;

Sources/Sentry/include/SentryMetricKitIntegration.h

@@ -1,6 +1,5 @@
 #import "SentryBaseIntegration.h"
 #import "SentryEvent.h"
-#import "SentryIntegrationProtocol.h"
 #import "SentrySwift.h"
 #import <Foundation/Foundation.h>
 
@@ -19,8 +18,7 @@ static NSString *const SentryMetricKitHangDiagnosticMechanism = @"mx_hang_diagno
 
 API_AVAILABLE(ios(15.0), macos(12.0), macCatalyst(15.0))
 API_UNAVAILABLE(tvos, watchos)
-@interface SentryMetricKitIntegration
-    : SentryBaseIntegration <SentryIntegrationProtocol, SentryMXManagerDelegate>
+@interface SentryMetricKitIntegration : SentryBaseIntegration <SentryMXManagerDelegate>
 
 @end
 

Sources/Sentry/include/SentryNetworkTrackingIntegration.h

@@ -1,9 +1,8 @@
 #import "SentryBaseIntegration.h"
-#import "SentryIntegrationProtocol.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface SentryNetworkTrackingIntegration : SentryBaseIntegration <SentryIntegrationProtocol>
+@interface SentryNetworkTrackingIntegration : SentryBaseIntegration
 
 @end
 

Sources/Sentry/include/SentryPerformanceTrackingIntegration.h

@@ -1,5 +1,4 @@
 #import "SentryBaseIntegration.h"
-#import "SentryIntegrationProtocol.h"
 #import <Foundation/Foundation.h>
 
 NS_ASSUME_NONNULL_BEGIN
@@ -9,7 +8,7 @@ NS_ASSUME_NONNULL_BEGIN
  * Automatic UI performance setup can be avoided by setting @c enableAutoPerformanceTracing to @c NO
  * in @c SentryOptions during SentrySDK initialization.
  */
-@interface SentryPerformanceTrackingIntegration : SentryBaseIntegration <SentryIntegrationProtocol>
+@interface SentryPerformanceTrackingIntegration : SentryBaseIntegration
 
 @end
 

Sources/Sentry/include/SentryScreenshotIntegration.h

@@ -1,14 +1,12 @@
 #import "SentryBaseIntegration.h"
 #import "SentryClient+Private.h"
-#import "SentryIntegrationProtocol.h"
 #import "SentryScreenshot.h"
 #import <Foundation/Foundation.h>
 
 NS_ASSUME_NONNULL_BEGIN
 #if SENTRY_HAS_UIKIT
 
-@interface SentryScreenshotIntegration
-    : SentryBaseIntegration <SentryIntegrationProtocol, SentryClientAttachmentProcessor>
+@interface SentryScreenshotIntegration : SentryBaseIntegration <SentryClientAttachmentProcessor>
 
 @end
 

Sources/Sentry/include/SentryUIEventTrackingIntegration.h

@@ -1,10 +1,9 @@
 #import "SentryBaseIntegration.h"
-#import "SentryIntegrationProtocol.h"
 #import <Foundation/Foundation.h>
 
 NS_ASSUME_NONNULL_BEGIN
 #if SENTRY_HAS_UIKIT
-@interface SentryUIEventTrackingIntegration : SentryBaseIntegration <SentryIntegrationProtocol>
+@interface SentryUIEventTrackingIntegration : SentryBaseIntegration
 
 @end
 #endif

Sources/Sentry/include/SentryViewHierarchyIntegration.h

@@ -1,13 +1,11 @@
 #import "SentryBaseIntegration.h"
 #import "SentryClient+Private.h"
-#import "SentryIntegrationProtocol.h"
 #import <Foundation/Foundation.h>
 
 NS_ASSUME_NONNULL_BEGIN
 #if SENTRY_HAS_UIKIT
 
-@interface SentryViewHierarchyIntegration
-    : SentryBaseIntegration <SentryIntegrationProtocol, SentryClientAttachmentProcessor>
+@interface SentryViewHierarchyIntegration : SentryBaseIntegration <SentryClientAttachmentProcessor>
 
 @end
 

Sources/Sentry/include/SentryWatchdogTerminationTrackingIntegration.h

@@ -1,12 +1,11 @@
 #import "SentryANRTracker.h"
 #import "SentryBaseIntegration.h"
-#import "SentryIntegrationProtocol.h"
 #import <Foundation/Foundation.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
 @interface SentryWatchdogTerminationTrackingIntegration
-    : SentryBaseIntegration <SentryIntegrationProtocol, SentryANRTrackerDelegate>
+    : SentryBaseIntegration <SentryANRTrackerDelegate>
 
 @end
 

Tests/SentryTests/Integrations/SentryCrash/SentryTestIntegration.h

@@ -1,11 +1,11 @@
-#import "SentryIntegrationProtocol.h"
+#import "SentryBaseIntegration.h"
 #import <Foundation/Foundation.h>
 
 @class SentryOptions;
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface SentryTestIntegration : NSObject <SentryIntegrationProtocol>
+@interface SentryTestIntegration : SentryBaseIntegration
 
 @property (nonatomic, strong) SentryOptions *options;