ref: Pass reachability to init for HTTPTransport (#6991)

philipphofmann · web-flow · commit 4ef85d2bc7d3 · 2025-12-05T11:18:56.000+01:00
Instead of retrieving the reachability class via the
DependencyContainer, pass it in via the init method.
diff --git a/Sources/Sentry/SentryClient.m b/Sources/Sentry/SentryClient.m
@@ -72,11 +72,12 @@ - (_Nullable instancetype)initWithOptions:(SentryOptions *)options
         return nil;
     }
 
-    NSArray<id<SentryTransport>> *transports =
-        [SentryTransportFactory initTransports:options
-                                  dateProvider:SentryDependencyContainer.sharedInstance.dateProvider
-                             sentryFileManager:fileManager
-                                    rateLimits:SentryDependencyContainer.sharedInstance.rateLimits];
+    NSArray<id<SentryTransport>> *transports = [SentryTransportFactory
+           initTransports:options
+             dateProvider:SentryDependencyContainer.sharedInstance.dateProvider
+        sentryFileManager:fileManager
+               rateLimits:SentryDependencyContainer.sharedInstance.rateLimits
+             reachability:SentryDependencyContainer.sharedInstance.reachability];
 
     SentryTransportAdapter *transportAdapter =
         [[SentryTransportAdapter alloc] initWithTransports:transports options:options];
diff --git a/Sources/Sentry/SentryHttpTransport.m b/Sources/Sentry/SentryHttpTransport.m
@@ -25,6 +25,7 @@ @interface SentryHttpTransport () <SentryReachabilityObserver>
 @property (nonatomic, strong) SentryDispatchQueueWrapper *dispatchQueue;
 @property (nonatomic, strong) dispatch_group_t dispatchGroup;
 @property (nonatomic, strong) id<SentryCurrentDateProvider> dateProvider;
+@property (nonatomic, strong) SentryReachability *reachability;
 
 #if defined(SENTRY_TEST) || defined(SENTRY_TEST_CI) || defined(DEBUG)
 @property (nullable, nonatomic, strong) void (^startFlushCallback)(void);
@@ -63,6 +64,7 @@ - (id)initWithDsn:(SentryDsn *)dsn
                  rateLimits:(id<SentryRateLimits>)rateLimits
           envelopeRateLimit:(SentryEnvelopeRateLimit *)envelopeRateLimit
        dispatchQueueWrapper:(SentryDispatchQueueWrapper *)dispatchQueueWrapper
+               reachability:(SentryReachability *)reachability
 {
     if (self = [super init]) {
         self.dsn = dsn;
@@ -76,6 +78,7 @@ - (id)initWithDsn:(SentryDsn *)dsn
         self.dispatchQueue = dispatchQueueWrapper;
         self.dateProvider = dateProvider;
         self.dispatchGroup = dispatch_group_create();
+        self.reachability = reachability;
         _isSending = NO;
         _isFlushing = NO;
         self.discardedEvents = [NSMutableDictionary new];
@@ -90,7 +93,7 @@ - (id)initWithDsn:(SentryDsn *)dsn
 
         [self sendAllCachedEnvelopes];
 
-        [SentryDependencyContainer.sharedInstance.reachability addObserver:self];
+        [self.reachability addObserver:self];
     }
     return self;
 }
@@ -107,7 +110,7 @@ - (void)connectivityChanged:(BOOL)connected typeDescription:(nonnull NSString *)
 
 - (void)dealloc
 {
-    [SentryDependencyContainer.sharedInstance.reachability removeObserver:self];
+    [self.reachability removeObserver:self];
 }
 
 - (void)sendEnvelope:(SentryEnvelope *)envelope
diff --git a/Sources/Sentry/SentryTransportFactory.m b/Sources/Sentry/SentryTransportFactory.m
@@ -21,6 +21,7 @@ @implementation SentryTransportFactory
                                     dateProvider:(id<SentryCurrentDateProvider>)dateProvider
                                sentryFileManager:(SentryFileManager *)sentryFileManager
                                       rateLimits:(id<SentryRateLimits>)rateLimits
+                                    reachability:(SentryReachability *)reachability
 {
     NSMutableArray<id<SentryTransport>> *transports = [NSMutableArray array];
 
@@ -60,7 +61,8 @@ @implementation SentryTransportFactory
                                       requestBuilder:requestBuilder
                                           rateLimits:rateLimits
                                    envelopeRateLimit:envelopeRateLimit
-                                dispatchQueueWrapper:dispatchQueueWrapper];
+                                dispatchQueueWrapper:dispatchQueueWrapper
+                                        reachability:reachability];
 
         [transports addObject:httpTransport];
     } else {
diff --git a/Sources/Sentry/include/SentryHttpTransport.h b/Sources/Sentry/include/SentryHttpTransport.h
@@ -8,6 +8,7 @@
 @class SentryNSURLRequestBuilder;
 @class SentryDsn;
 @class SentryFileManager;
+@class SentryReachability;
 @protocol SentryCurrentDateProvider;
 @protocol SentryRateLimits;
 
@@ -25,7 +26,8 @@ SENTRY_NO_INIT
              requestBuilder:(SentryNSURLRequestBuilder *)requestBuilder
                  rateLimits:(id<SentryRateLimits>)rateLimits
           envelopeRateLimit:(SentryEnvelopeRateLimit *)envelopeRateLimit
-       dispatchQueueWrapper:(SentryDispatchQueueWrapper *)dispatchQueueWrapper;
+       dispatchQueueWrapper:(SentryDispatchQueueWrapper *)dispatchQueueWrapper
+               reachability:(SentryReachability *)reachability;
 
 @end
 
diff --git a/Sources/Sentry/include/SentryTransportFactory.h b/Sources/Sentry/include/SentryTransportFactory.h
@@ -2,6 +2,7 @@
 
 @class SentryFileManager;
 @class SentryOptions;
+@class SentryReachability;
 @protocol SentryCurrentDateProvider;
 @protocol SentryRateLimits;
 
@@ -13,7 +14,8 @@ NS_SWIFT_NAME(TransportInitializer)
 + (NSArray<id<SentryTransport>> *)initTransports:(SentryOptions *)options
                                     dateProvider:(id<SentryCurrentDateProvider>)dateProvider
                                sentryFileManager:(SentryFileManager *)sentryFileManager
-                                      rateLimits:(id<SentryRateLimits>)rateLimits;
+                                      rateLimits:(id<SentryRateLimits>)rateLimits
+                                    reachability:(SentryReachability *)reachability;
 
 @end
 
diff --git a/Tests/SentryTests/Networking/SentryHttpTransportFlushIntegrationTests.swift b/Tests/SentryTests/Networking/SentryHttpTransportFlushIntegrationTests.swift
@@ -178,7 +178,7 @@ final class SentryHttpTransportFlushIntegrationTests: XCTestCase {
 
         let rateLimits = DefaultRateLimits(retryAfterHeaderParser: RetryAfterHeaderParser(httpDateParser: HttpDateParser(), currentDateProvider: currentDate), andRateLimitParser: RateLimitParser(currentDateProvider: currentDate), currentDateProvider: currentDate)
 
-        return (SentryHttpTransport(
+        let transport = SentryHttpTransport(
             dsn: try XCTUnwrap(options.parsedDsn),
             sendClientReports: options.sendClientReports,
             cachedEnvelopeSendDelay: 0.0,
@@ -188,8 +188,11 @@ final class SentryHttpTransportFlushIntegrationTests: XCTestCase {
             requestBuilder: TestNSURLRequestBuilder(),
             rateLimits: rateLimits,
             envelopeRateLimit: EnvelopeRateLimit(rateLimits: rateLimits),
-            dispatchQueueWrapper: dispatchQueueWrapper
-        ), requestManager, fileManager, dispatchQueueWrapper)
+            dispatchQueueWrapper: dispatchQueueWrapper,
+            reachability: TestSentryReachability()
+        )
+
+        return (transport, requestManager, fileManager, dispatchQueueWrapper)
     }
 
     private func waitForEnvelopeToBeStored(_ dispatchQueueWrapper: SentryDispatchQueueWrapper) {
diff --git a/Tests/SentryTests/Networking/SentryHttpTransportTests.swift b/Tests/SentryTests/Networking/SentryHttpTransportTests.swift
@@ -29,9 +29,7 @@ class SentryHttpTransportTests: XCTestCase {
             return dqw
         }()
 
-#if !os(watchOS)
         let reachability = TestSentryReachability()
-#endif // !os(watchOS)
 
         let flushTimeout: TimeInterval = 2.0
 
@@ -127,7 +125,8 @@ class SentryHttpTransportTests: XCTestCase {
 
         func getSut(
             fileManager: SentryFileManager? = nil,
-            dispatchQueueWrapper: SentryDispatchQueueWrapper? = nil
+            dispatchQueueWrapper: SentryDispatchQueueWrapper? = nil,
+            reachability: SentryReachability? = nil
         ) throws -> SentryHttpTransport {
             return SentryHttpTransport(
                 dsn: try XCTUnwrap(options.parsedDsn),
@@ -139,7 +138,8 @@ class SentryHttpTransportTests: XCTestCase {
                 requestBuilder: requestBuilder,
                 rateLimits: rateLimits,
                 envelopeRateLimit: EnvelopeRateLimit(rateLimits: rateLimits),
-                dispatchQueueWrapper: dispatchQueueWrapper ?? self.dispatchQueueWrapper
+                dispatchQueueWrapper: dispatchQueueWrapper ?? self.dispatchQueueWrapper,
+                reachability: reachability ?? self.reachability
             )
         }
     }
diff --git a/Tests/SentryTests/Networking/SentryTransportFactoryTests.swift b/Tests/SentryTests/Networking/SentryTransportFactoryTests.swift
@@ -30,7 +30,8 @@ class SentryTransportFactoryTests: XCTestCase {
             options,
             dateProvider: dateProvider,
             sentryFileManager: fileManager,
-            rateLimits: rateLimiting()
+            rateLimits: rateLimiting(),
+            reachability: TestSentryReachability()
         )
         let httpTransport = transports.first
         let requestManager = try XCTUnwrap(Dynamic(httpTransport).requestManager.asObject as? SentryQueueableRequestManager)
@@ -70,7 +71,8 @@ class SentryTransportFactoryTests: XCTestCase {
             options,
             dateProvider: dateProvider,
             sentryFileManager: fileManager,
-            rateLimits: rateLimiting()
+            rateLimits: rateLimiting(),
+            reachability: TestSentryReachability()
         )
                 
         let httpTransport = transports.first
@@ -103,7 +105,8 @@ class SentryTransportFactoryTests: XCTestCase {
                 dateProvider: dateProvider,
                 dispatchQueueWrapper: TestSentryDispatchQueueWrapper()
             ),
-            rateLimits: rateLimiting()
+            rateLimits: rateLimiting(),
+            reachability: TestSentryReachability()
         )
 
         // -- Assert --
@@ -133,7 +136,8 @@ class SentryTransportFactoryTests: XCTestCase {
                 dateProvider: dateProvider,
                 dispatchQueueWrapper: TestSentryDispatchQueueWrapper()
             ),
-            rateLimits: rateLimiting()
+            rateLimits: rateLimiting(),
+            reachability: TestSentryReachability()
         )
 
         // -- Assert --
@@ -157,7 +161,8 @@ class SentryTransportFactoryTests: XCTestCase {
                 dateProvider: dateProvider,
                 dispatchQueueWrapper: TestSentryDispatchQueueWrapper()
             ),
-            rateLimits: rateLimiting()
+            rateLimits: rateLimiting(),
+            reachability: TestSentryReachability()
         )
 
         // -- Assert --
diff --git a/Tests/SentryTests/Networking/SentryTransportInitializerTests.swift b/Tests/SentryTests/Networking/SentryTransportInitializerTests.swift
@@ -31,7 +31,8 @@ class SentryTransportInitializerTests: XCTestCase {
             options,
             dateProvider: dateProvider,
             sentryFileManager: fileManager,
-            rateLimits: rateLimits
+            rateLimits: rateLimits,
+            reachability: TestSentryReachability()
         )
         XCTAssertEqual(result.count, 1)
         
diff --git a/Tests/SentryTests/SentryClientTests.swift b/Tests/SentryTests/SentryClientTests.swift
@@ -4,7 +4,7 @@ import XCTest
 
 extension SentryClientInternal {
     convenience init(options: Options, fileManager: SentryFileManager) {
-        let transports = TransportInitializer.initTransports(options, dateProvider: SentryDependencyContainer.sharedInstance().dateProvider, sentryFileManager: fileManager, rateLimits: SentryDependencyContainer.sharedInstance().rateLimits)
+        let transports = TransportInitializer.initTransports(options, dateProvider: SentryDependencyContainer.sharedInstance().dateProvider, sentryFileManager: fileManager, rateLimits: SentryDependencyContainer.sharedInstance().rateLimits, reachability: TestSentryReachability())
 
         let transportAdapter = SentryTransportAdapter(transports: transports, options: options)
 

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,8 @@ class SentryTransportInitializerTests: XCTestCase {`
`31`	`31`	`options,`
`32`	`32`	`dateProvider: dateProvider,`
`33`	`33`	`sentryFileManager: fileManager,`
`34`		`- rateLimits: rateLimits`
	`34`	`+ rateLimits: rateLimits,`
	`35`	`+ reachability: TestSentryReachability()`
`35`	`36`	`)`
`36`	`37`	`XCTAssertEqual(result.count, 1)`
`37`	`38`