Remove SENTRY_HAS_REACHABILITY macro and enable SentryReachability to all platforms

itaybre · itaybre · commit 5de0617ccc8b · 2025-09-10T17:15:17.000-03:00
diff --git a/Sources/Sentry/Public/SentryDefines.h b/Sources/Sentry/Public/SentryDefines.h
@@ -65,12 +65,6 @@
     -(instancetype)init NS_UNAVAILABLE;                                                            \
     +(instancetype) new NS_UNAVAILABLE;
 
-#if !TARGET_OS_WATCH && !(TARGET_OS_VISION && SENTRY_NO_UIKIT == 1)
-#    define SENTRY_HAS_REACHABILITY 1
-#else
-#    define SENTRY_HAS_REACHABILITY 0
-#endif
-
 @class SentryBreadcrumb;
 @class SentryEvent;
 @class SentrySamplingContext;
diff --git a/Sources/Sentry/SentryBreadcrumbTracker.m b/Sources/Sentry/SentryBreadcrumbTracker.m
@@ -25,10 +25,7 @@
 static NSString *const SentryBreadcrumbTrackerSwizzleSendAction
     = @"SentryBreadcrumbTrackerSwizzleSendAction";
 
-@interface SentryBreadcrumbTracker ()
-#if SENTRY_HAS_REACHABILITY
-    <SentryReachabilityObserver>
-#endif // !TARGET_OS_WATCH
+@interface SentryBreadcrumbTracker () <SentryReachabilityObserver>
 
 @property (nonatomic, weak) id<SentryBreadcrumbDelegate> delegate;
 
@@ -38,12 +35,10 @@ @implementation SentryBreadcrumbTracker {
     BOOL _reportAccessibilityIdentifier;
 }
 
-#if SENTRY_HAS_REACHABILITY
 - (void)dealloc
 {
     [SentryDependencyContainer.sharedInstance.reachability removeObserver:self];
 }
-#endif // !TARGET_OS_WATCH
 
 - (instancetype)initReportAccessibilityIdentifier:(BOOL)report
 {
@@ -58,9 +53,7 @@ - (void)startWithDelegate:(id<SentryBreadcrumbDelegate>)delegate
     _delegate = delegate;
     [self addEnabledCrumb];
     [self trackApplicationNotifications];
-#if SENTRY_HAS_REACHABILITY
     [self trackNetworkConnectivityChanges];
-#endif // !TARGET_OS_WATCH
 }
 
 #if SENTRY_HAS_UIKIT
@@ -80,9 +73,7 @@ - (void)stop
         removeSwizzleSendActionForKey:SentryBreadcrumbTrackerSwizzleSendAction];
 #endif // SENTRY_HAS_UIKIT
     _delegate = nil;
-#if SENTRY_HAS_REACHABILITY
     [self stopTrackNetworkConnectivityChanges];
-#endif // SENTRY_HAS_REACHABILITY
 }
 
 - (void)trackApplicationNotifications
@@ -142,7 +133,6 @@ - (void)trackApplicationNotifications
 #endif // SENTRY_HAS_UIKIT || SENTRY_TARGET_MACOS_HAS_UI
 }
 
-#if SENTRY_HAS_REACHABILITY
 - (void)trackNetworkConnectivityChanges
 {
     [SentryDependencyContainer.sharedInstance.reachability addObserver:self];
@@ -162,8 +152,6 @@ - (void)connectivityChanged:(BOOL)connected typeDescription:(nonnull NSString *)
     [self.delegate addBreadcrumb:crumb];
 }
 
-#endif // SENTRY_HAS_REACHABILITY
-
 - (void)addBreadcrumbWithType:(NSString *)type
                  withCategory:(NSString *)category
                     withLevel:(SentryLevel)level
diff --git a/Sources/Sentry/SentryDependencyContainer.m b/Sources/Sentry/SentryDependencyContainer.m
@@ -112,9 +112,7 @@ + (instancetype)sharedInstance
 + (void)reset
 {
     @synchronized(sentryDependencyContainerInstanceLock) {
-#if SENTRY_HAS_REACHABILITY
         [instance->_reachability removeAllObservers];
-#endif // SENTRY_HAS_REACHABILITY
 
 #if SENTRY_HAS_UIKIT
         [instance->_framesTracker stop];
@@ -182,9 +180,7 @@ - (instancetype)init
                                                          andRateLimitParser:rateLimitParser
                                                         currentDateProvider:_dateProvider];
 
-#if SENTRY_HAS_REACHABILITY
         _reachability = [[SentryReachability alloc] init];
-#endif // SENTRY_HAS_REACHABILITY
 
         isInitialializingDependencyContainer = NO;
     }
diff --git a/Sources/Sentry/SentryHttpTransport.m b/Sources/Sentry/SentryHttpTransport.m
@@ -16,10 +16,7 @@
 #import "SentrySerialization.h"
 #import "SentrySwift.h"
 
-@interface SentryHttpTransport ()
-#if SENTRY_HAS_REACHABILITY
-    <SentryReachabilityObserver>
-#endif // SENTRY_HAS_REACHABILITY
+@interface SentryHttpTransport () <SentryReachabilityObserver>
 
 @property (nonatomic, readonly) NSTimeInterval cachedEnvelopeSendDelay;
 @property (nonatomic, strong) SentryFileManager *fileManager;
@@ -92,14 +89,11 @@ - (id)initWithDsn:(SentryDsn *)dsn
 
         [self sendAllCachedEnvelopes];
 
-#if SENTRY_HAS_REACHABILITY
         [SentryDependencyContainer.sharedInstance.reachability addObserver:self];
-#endif // SENTRY_HAS_REACHABILITY
     }
     return self;
 }
 
-#if SENTRY_HAS_REACHABILITY
 - (void)connectivityChanged:(BOOL)connected typeDescription:(nonnull NSString *)typeDescription
 {
     if (connected) {
@@ -114,7 +108,6 @@ - (void)dealloc
 {
     [SentryDependencyContainer.sharedInstance.reachability removeObserver:self];
 }
-#endif // SENTRY_HAS_REACHABILITY
 
 - (void)sendEnvelope:(SentryEnvelope *)envelope
 {
diff --git a/Sources/Sentry/include/HybridPublic/SentryDependencyContainer.h b/Sources/Sentry/include/HybridPublic/SentryDependencyContainer.h
@@ -25,6 +25,7 @@
 @class SentryOptions;
 @class SentrySessionTracker;
 @class SentryGlobalEventProcessor;
+@class SentryReachability;
 
 @protocol SentryANRTracker;
 @protocol SentryRandomProtocol;
@@ -54,10 +55,6 @@
 @protocol SentryUIDeviceWrapper;
 #endif // TARGET_OS_IOS
 
-#if !TARGET_OS_WATCH
-@class SentryReachability;
-#endif // !TARGET_OS_WATCH
-
 NS_ASSUME_NONNULL_BEGIN
 
 /**
@@ -95,10 +92,7 @@ SENTRY_NO_INIT
 @property (nonatomic, strong) id<SentryRateLimits> rateLimits;
 @property (nonatomic, strong) id<SentryApplication> application;
 @property (nonatomic, strong) SentryThreadsafeApplication *threadsafeApplication;
-
-#if SENTRY_HAS_REACHABILITY
 @property (nonatomic, strong) SentryReachability *reachability;
-#endif // !TARGET_OS_WATCH
 
 #if SENTRY_HAS_UIKIT
 @property (nonatomic, strong) id<SentryUIDeviceWrapper> uiDeviceWrapper;
diff --git a/Sources/Swift/Networking/SentryReachability.swift b/Sources/Swift/Networking/SentryReachability.swift
@@ -1,15 +1,24 @@
 import Foundation
 import Network
 
-#if !os(watchOS) && !((swift(>=5.9) && os(visionOS)) && SENTRY_NO_UIKIT)
-
 // MARK: - SentryConectivity
-@objc
+#if DEBUG || SENTRY_TEST || SENTRY_TEST_CI
+@objc @_spi(Private)
 public enum SentryConnectivity: Int {
     case cellular
     case wiFi
     case none
-    
+}
+#else
+@objc
+enum SentryConnectivity: Int {
+    case cellular
+    case wiFi
+    case none
+}
+#endif // DEBUG || SENTRY_TEST || SENTRY_TEST_CI
+
+extension SentryConnectivity {
     func toString() -> String {
         switch self {
         case .cellular:
@@ -68,7 +77,7 @@ public class SentryReachability: NSObject {
         }
 #endif // DEBUG || SENTRY_TEST || SENTRY_TEST_CI
         
-        if #available(iOS 12.0, macOS 10.14, tvOS 12.0, *) {
+        if #available(iOS 12.0, macOS 10.14, tvOS 12.0, visionOS 1.0, watchOS 5.0, *) {
             // If we don't use the main queue to start the monitor, the app seems to freeze on iOS 14.8 (SauceLabs)
             // Also do it async to avoid blocking the main thread
             // Right now `SentryDispatchQueueWrapper.dispatchAsyncOnMainQueue` is not used because the SDK starts on the main thread,
@@ -125,7 +134,7 @@ public class SentryReachability: NSObject {
         currentConnectivity = .none
         
         // Clean up NWPathMonitor
-        if #available(iOS 12.0, macOS 10.14, tvOS 12.0, *) {
+        if #available(iOS 12.0, macOS 10.14, tvOS 12.0, visionOS 1.0, watchOS 5.0, *) {
             if let monitor = pathMonitor as? NWPathMonitor {
                 SentrySDKLog.debug("Stopping NWPathMonitor")
                 monitor.cancel()
@@ -136,7 +145,7 @@ public class SentryReachability: NSObject {
         SentrySDKLog.debug("Cleaning up reachability queue.")
     }
     
-    @available(iOS 12.0, macOS 10.14, tvOS 12.0, *)
+    @available(iOS 12.0, macOS 10.14, tvOS 12.0, visionOS 1.0, watchOS 5.0, *)
     private func pathUpdateHandler(_ path: NWPath) {
         SentrySDKLog.debug("SentryPathUpdateHandler called with path status: \(path.status)")
         
@@ -151,7 +160,7 @@ public class SentryReachability: NSObject {
         connectivityCallback(connectivity)
     }
     
-    @available(iOS 12.0, macOS 10.14, tvOS 12.0, *)
+    @available(iOS 12.0, macOS 10.14, tvOS 12.0, visionOS 1.0, watchOS 5.0, *)
     private func connectivityFromPath(_ path: NWPath) -> SentryConnectivity {
         guard path.status == .satisfied else {
             return .none
@@ -211,7 +220,7 @@ public class SentryReachability: NSObject {
 
 // MARK: - Test utils
 #if DEBUG || SENTRY_TEST || SENTRY_TEST_CI
-@available(iOS 12.0, macOS 10.14, tvOS 12.0, *)
+@available(iOS 12.0, macOS 10.14, tvOS 12.0, visionOS 1.0, watchOS 5.0, *)
 extension SentryReachability {
     @objc public func setReachabilityIgnoreActualCallback(_ value: Bool) {
         SentrySDKLog.debug("Setting ignore actual callback to \(value)")
@@ -229,5 +238,3 @@ extension SentryReachability {
     }
 }
 #endif // DEBUG || SENTRY_TEST || SENTRY_TEST_CI
-
-#endif // !os(watchOS) && !((swift(>=5.9) && os(visionOS)) && SENTRY_NO_UIKIT)

Original file line number	Diff line number	Diff line change
`@@ -25,10 +25,7 @@`
`25`	`25`	`static NSString *const SentryBreadcrumbTrackerSwizzleSendAction`
`26`	`26`	`= @"SentryBreadcrumbTrackerSwizzleSendAction";`
`27`	`27`
`28`		`-@interface SentryBreadcrumbTracker ()`
`29`		`-#if SENTRY_HAS_REACHABILITY`
`30`		`- <SentryReachabilityObserver>`
`31`		`-#endif // !TARGET_OS_WATCH`
	`28`	`+@interface SentryBreadcrumbTracker () <SentryReachabilityObserver>`
`32`	`29`
`33`	`30`	`@property (nonatomic, weak) id<SentryBreadcrumbDelegate> delegate;`
`34`	`31`
`@@ -38,12 +35,10 @@ @implementation SentryBreadcrumbTracker {`
`38`	`35`	`BOOL _reportAccessibilityIdentifier;`
`39`	`36`	`}`
`40`	`37`
`41`		`-#if SENTRY_HAS_REACHABILITY`
`42`	`38`	`- (void)dealloc`
`43`	`39`	`{`
`44`	`40`	`[SentryDependencyContainer.sharedInstance.reachability removeObserver:self];`
`45`	`41`	`}`
`46`		`-#endif // !TARGET_OS_WATCH`
`47`	`42`
`48`	`43`	`- (instancetype)initReportAccessibilityIdentifier:(BOOL)report`
`49`	`44`	`{`
`@@ -58,9 +53,7 @@ - (void)startWithDelegate:(id<SentryBreadcrumbDelegate>)delegate`
`58`	`53`	`_delegate = delegate;`
`59`	`54`	`[self addEnabledCrumb];`
`60`	`55`	`[self trackApplicationNotifications];`
`61`		`-#if SENTRY_HAS_REACHABILITY`
`62`	`56`	`[self trackNetworkConnectivityChanges];`
`63`		`-#endif // !TARGET_OS_WATCH`
`64`	`57`	`}`
`65`	`58`
`66`	`59`	`#if SENTRY_HAS_UIKIT`
`@@ -80,9 +73,7 @@ - (void)stop`
`80`	`73`	`removeSwizzleSendActionForKey:SentryBreadcrumbTrackerSwizzleSendAction];`
`81`	`74`	`#endif // SENTRY_HAS_UIKIT`
`82`	`75`	`_delegate = nil;`
`83`		`-#if SENTRY_HAS_REACHABILITY`
`84`	`76`	`[self stopTrackNetworkConnectivityChanges];`
`85`		`-#endif // SENTRY_HAS_REACHABILITY`
`86`	`77`	`}`
`87`	`78`
`88`	`79`	`- (void)trackApplicationNotifications`
`@@ -142,7 +133,6 @@ - (void)trackApplicationNotifications`
`142`	`133`	`#endif // SENTRY_HAS_UIKIT \|\| SENTRY_TARGET_MACOS_HAS_UI`
`143`	`134`	`}`
`144`	`135`
`145`		`-#if SENTRY_HAS_REACHABILITY`
`146`	`136`	`- (void)trackNetworkConnectivityChanges`
`147`	`137`	`{`
`148`	`138`	`[SentryDependencyContainer.sharedInstance.reachability addObserver:self];`
`@@ -162,8 +152,6 @@ - (void)connectivityChanged:(BOOL)connected typeDescription:(nonnull NSString *)`
`162`	`152`	`[self.delegate addBreadcrumb:crumb];`
`163`	`153`	`}`
`164`	`154`
`165`		`-#endif // SENTRY_HAS_REACHABILITY`
`166`		`-`
`167`	`155`	`- (void)addBreadcrumbWithType:(NSString *)type`
`168`	`156`	`withCategory:(NSString *)category`
`169`	`157`	`withLevel:(SentryLevel)level`
Original file line number	Diff line number	Diff line change
`@@ -16,10 +16,7 @@`
`16`	`16`	`#import "SentrySerialization.h"`
`17`	`17`	`#import "SentrySwift.h"`
`18`	`18`
`19`		`-@interface SentryHttpTransport ()`
`20`		`-#if SENTRY_HAS_REACHABILITY`
`21`		`- <SentryReachabilityObserver>`
`22`		`-#endif // SENTRY_HAS_REACHABILITY`
	`19`	`+@interface SentryHttpTransport () <SentryReachabilityObserver>`
`23`	`20`
`24`	`21`	`@property (nonatomic, readonly) NSTimeInterval cachedEnvelopeSendDelay;`
`25`	`22`	`@property (nonatomic, strong) SentryFileManager *fileManager;`
`@@ -92,14 +89,11 @@ - (id)initWithDsn:(SentryDsn *)dsn`
`92`	`89`
`93`	`90`	`[self sendAllCachedEnvelopes];`
`94`	`91`
`95`		`-#if SENTRY_HAS_REACHABILITY`
`96`	`92`	`[SentryDependencyContainer.sharedInstance.reachability addObserver:self];`
`97`		`-#endif // SENTRY_HAS_REACHABILITY`
`98`	`93`	`}`
`99`	`94`	`return self;`
`100`	`95`	`}`
`101`	`96`
`102`		`-#if SENTRY_HAS_REACHABILITY`
`103`	`97`	`- (void)connectivityChanged:(BOOL)connected typeDescription:(nonnull NSString *)typeDescription`
`104`	`98`	`{`
`105`	`99`	`if (connected) {`
`@@ -114,7 +108,6 @@ - (void)dealloc`
`114`	`108`	`{`
`115`	`109`	`[SentryDependencyContainer.sharedInstance.reachability removeObserver:self];`
`116`	`110`	`}`
`117`		`-#endif // SENTRY_HAS_REACHABILITY`
`118`	`111`
`119`	`112`	`- (void)sendEnvelope:(SentryEnvelope *)envelope`
`120`	`113`	`{`