chore: Remove SentryDependencyContainer uses in SentryCrash

Sources/Sentry/SentryClient.m

@@ -729,7 +729,7 @@ - (SentryEvent *_Nullable)prepareEvent:(SentryEvent *_Nullable)event
 
 #if SENTRY_HAS_UIKIT
     if (!isFatalEvent && eventIsNotReplay) {
-        NSDictionary *currentContext = event.context ?: @{};
+        NSDictionary *currentContext = event.context ?: @{ };
         event.context = [self.eventContextEnricher enrichWithAppState:currentContext];
     }
 #endif
@@ -975,19 +975,19 @@ - (void)applyExtraDeviceContextToEvent:(SentryEvent *)event
                           [extraContext[SENTRY_CONTEXT_DEVICE_KEY]
                               isKindOfClass:NSDictionary.class]) {
                           [device addEntriesFromDictionary:extraContext[SENTRY_CONTEXT_DEVICE_KEY]
-                                  ?: @ {}];
+                                  ?: @ { }];
                       }
                   }];
 
-    [self
-        modifyContext:event
-                  key:SENTRY_CONTEXT_APP_KEY
-                block:^(NSMutableDictionary *app) {
-                    if (extraContext[SENTRY_CONTEXT_APP_KEY] != nil &&
-                        [extraContext[SENTRY_CONTEXT_APP_KEY] isKindOfClass:NSDictionary.class]) {
-                        [app addEntriesFromDictionary:extraContext[SENTRY_CONTEXT_APP_KEY] ?: @ {}];
-                    }
-                }];
+    [self modifyContext:event
+                    key:SENTRY_CONTEXT_APP_KEY
+                  block:^(NSMutableDictionary *app) {
+                      if (extraContext[SENTRY_CONTEXT_APP_KEY] != nil &&
+                          [extraContext[SENTRY_CONTEXT_APP_KEY] isKindOfClass:NSDictionary.class]) {
+                          [app addEntriesFromDictionary:extraContext[SENTRY_CONTEXT_APP_KEY]
+                                  ?: @ { }];
+                      }
+                  }];
 }
 
 #if SENTRY_HAS_UIKIT

Sources/Sentry/SentryCrashReportConverter.m

@@ -51,7 +51,7 @@ - (instancetype)initWithReport:(NSDictionary *)report inAppLogic:(SentryInAppLog
         // here. For more details please check out SentryCrashScopeObserver.
         NSMutableDictionary *userContextMerged =
             [[NSMutableDictionary alloc] initWithDictionary:userContextUnMerged];
-        [userContextMerged addEntriesFromDictionary:report[@"sentry_sdk_scope"] ?: @{}];
+        [userContextMerged addEntriesFromDictionary:report[@"sentry_sdk_scope"] ?: @{ }];
         [userContextMerged removeObjectForKey:@"sentry_sdk_scope"];
         self.userContext = userContextMerged;
 
@@ -120,7 +120,7 @@ - (SentryEvent *_Nullable)convertReportToEvent
         event.environment = self.userContext[@"environment"];
 
         NSMutableDictionary *mutableContext =
-            [[NSMutableDictionary alloc] initWithDictionary:self.userContext[@"context"] ?: @{}];
+            [[NSMutableDictionary alloc] initWithDictionary:self.userContext[@"context"] ?: @{ }];
         if (self.userContext[@"traceContext"]) {
             mutableContext[@"trace"] = self.userContext[@"traceContext"];
         }
@@ -513,8 +513,9 @@ - (void)enhanceValueFromNotableAddresses:(SentryException *)exception
         }
     }
     if (reasons.count > 0) {
-        exception.value = [[[reasons array] sortedArrayUsingSelector:@selector
-            (localizedCaseInsensitiveCompare:)] componentsJoinedByString:@" > "];
+        exception.value =
+            [[[reasons array] sortedArrayUsingSelector:@selector(localizedCaseInsensitiveCompare:)]
+                componentsJoinedByString:@" > "];
     }
 }
 

Sources/Sentry/SentryHub.m

@@ -399,15 +399,15 @@ - (void)captureReplayEvent:(SentryReplayEvent *)replayEvent
 
 - (id<SentrySpan>)startTransactionWithContext:(SentryTransactionContext *)transactionContext
 {
-    return [self startTransactionWithContext:transactionContext customSamplingContext:@{}];
+    return [self startTransactionWithContext:transactionContext customSamplingContext:@{ }];
 }
 
 - (id<SentrySpan>)startTransactionWithContext:(SentryTransactionContext *)transactionContext
                                   bindToScope:(BOOL)bindToScope
 {
     return [self startTransactionWithContext:transactionContext
                                  bindToScope:bindToScope
-                       customSamplingContext:@{}];
+                       customSamplingContext:@{ }];
 }
 
 - (id<SentrySpan>)startTransactionWithContext:(SentryTransactionContext *)transactionContext

Sources/Sentry/SentryNoOpSpan.m

@@ -70,7 +70,7 @@ - (void)setMeasurement:(NSString *)name value:(NSNumber *)value unit:(SentryMeas
 
 - (NSDictionary<NSString *, id> *)tags
 {
-    return @{};
+    return @{ };
 }
 
 - (BOOL)isFinished
@@ -95,7 +95,7 @@ - (SentryTraceHeader *)toTraceHeader
 
 - (NSDictionary *)serialize
 {
-    return @{};
+    return @{ };
 }
 
 @end

Sources/Sentry/SentryPerformanceTracker.m

@@ -100,7 +100,7 @@ - (SentrySpanId *)startSpanWithName:(NSString *)name
         newSpan = [SentrySDKInternal.currentHub
             startTransactionWithContext:context
                             bindToScope:bindToScope
-                  customSamplingContext:@{}
+                  customSamplingContext:@{ }
                           configuration:[SentryTracerConfiguration configurationWithBlock:^(
                                             SentryTracerConfiguration *configuration) {
                               configuration.waitForChildren = YES;

Sources/Sentry/SentryStacktraceBuilder.m

@@ -102,7 +102,7 @@ + (SentryStacktrace *_Nonnull)buildStacktraceFromFrames:(NSArray<SentryFrame *>
     // The frames must be ordered from caller to callee, or oldest to youngest
     NSArray<SentryFrame *> *framesReversed = [[framesCleared reverseObjectEnumerator] allObjects];
 
-    return [[SentryStacktrace alloc] initWithFrames:framesReversed registers:@{}];
+    return [[SentryStacktrace alloc] initWithFrames:framesReversed registers:@{ }];
 }
 
 @end

Sources/Sentry/SentryThreadHandle.cpp

@@ -108,14 +108,14 @@ namespace profiling {
     {
         const auto handle = pthreadHandle();
         if (handle == nullptr) {
-            return {};
+            return { };
         }
         char name[MAXTHREADNAMESIZE];
         if (SENTRY_ASYNC_SAFE_LOG_ERRNO_RETURN(pthread_getname_np(handle, name, sizeof(name)))
             == 0) {
             return std::string(name);
         }
-        return {};
+        return { };
     }
 
     int
@@ -158,7 +158,7 @@ namespace profiling {
     ThreadHandle::cpuInfo() const noexcept
     {
         if (handle_ == THREAD_NULL) {
-            return {};
+            return { };
         }
         ThreadCPUInfo cpuInfo;
         mach_msg_type_number_t count = THREAD_BASIC_INFO_COUNT;
@@ -203,7 +203,7 @@ namespace profiling {
     {
         const auto handle = pthreadHandle();
         if (handle == nullptr) {
-            return {};
+            return { };
         }
         const auto start = reinterpret_cast<std::uintptr_t>(pthread_get_stackaddr_np(handle));
         const auto end = start - pthread_get_stacksize_np(handle);

Sources/Sentry/SentryTracer.m

@@ -858,7 +858,7 @@ - (void)addAppStartMeasurements:(SentryTransaction *)transaction
                 ? [NSString stringWithFormat:@"%@.prewarmed", appContextType]
                 : appContextType;
             NSMutableDictionary *context =
-                [[NSMutableDictionary alloc] initWithDictionary:[transaction context] ?: @{}];
+                [[NSMutableDictionary alloc] initWithDictionary:[transaction context] ?: @{ }];
             NSDictionary *appContext = @{ @"app" : @ { @"start_type" : appStartType } };
             [SentryDictionary mergeEntriesFromDictionary:appContext intoDictionary:context];
             [transaction setContext:context];

Sources/Sentry/SentryTransaction.m

@@ -30,8 +30,8 @@ - (instancetype)initWithTrace:(SentryTracer *)trace children:(NSArray<id<SentryS
     }
 
     // Merge event tags and tracer tags (tracer tags take precedence)
-    NSDictionary<NSString *, NSString *> *eventTags = [super tags] ?: @{};
-    NSDictionary<NSString *, NSString *> *tracerTags = self.trace.tags ?: @{};
+    NSDictionary<NSString *, NSString *> *eventTags = [super tags] ?: @{ };
+    NSDictionary<NSString *, NSString *> *tracerTags = self.trace.tags ?: @{ };
 
     // Merge both, with tracer tags taking precedence
     // Note: We return a mutable dictionary copy (though declared as NSDictionary *).

Sources/Sentry/SentryUIEventTrackerTransactionMode.m

@@ -96,7 +96,7 @@ - (void)handleUIEvent:(NSString *)action
     __block SentryTracer *transaction = [SentrySDKInternal.currentHub
         startTransactionWithContext:context
                         bindToScope:YES
-              customSamplingContext:@{}
+              customSamplingContext:@{ }
                       configuration:[SentryTracerConfiguration configurationWithBlock:^(
                                         SentryTracerConfiguration *config) {
                           config.idleTimeout = self.idleTimeout;

Sources/Sentry/include/SentryCrash.h

@@ -30,6 +30,8 @@
 #import "SentryCrashReportWriter.h"
 #import "SentryDefines.h"
 
+@class SentryCrashBridge;
+
 typedef enum {
     SentryCrashDemangleLanguageNone = 0,
     SentryCrashDemangleLanguageCPlusPlus = 1,
@@ -43,7 +45,9 @@ typedef enum {
     SentryCrashCDeleteAlways
 } SentryCrashCDeleteBehavior;
 
-static NSString *const SENTRYCRASH_REPORT_ATTACHMENTS_ITEM = @"attachments";
+static NSString *_Nonnull const SENTRYCRASH_REPORT_ATTACHMENTS_ITEM = @"attachments";
+
+NS_ASSUME_NONNULL_BEGIN
 
 /**
  * Reports any crashes that occur in the application.
@@ -57,18 +61,22 @@ static NSString *const SENTRYCRASH_REPORT_ATTACHMENTS_ITEM = @"attachments";
 SENTRY_NO_INIT
 
 /** Init SentryCrash instance with custom base path. */
-- (instancetype)initWithBasePath:(NSString *)basePath NS_DESIGNATED_INITIALIZER;
+- (instancetype)initWithBasePath:(nullable NSString *)basePath NS_DESIGNATED_INITIALIZER;
 
 /** Cache directory base path. */
 @property (nonatomic, readwrite, retain) NSString *basePath;
 
+/** Bridge to SDK services (notification center, date provider, crash reporter).
+ * Must be set before calling install. */
+@property (nonatomic, strong) SentryCrashBridge *bridge;
+
 /** A dictionary containing any info you'd like to appear in crash reports. Must
  * contain only JSON-safe data: NSString for keys, and NSDictionary, NSArray,
  * NSString, NSDate, and NSNumber for values.
  *
  * Default: nil
  */
-@property (atomic, readwrite, retain) NSDictionary *userInfo;
+@property (atomic, readwrite, retain, nullable) NSDictionary *userInfo;
 
 /** What to do after sending reports via sendAllReportsWithCompletion:
  *
@@ -110,7 +118,7 @@ SENTRY_NO_INIT
  *
  * Default: nil
  */
-@property (nonatomic, readwrite, retain) NSArray *doNotIntrospectClasses;
+@property (nonatomic, readwrite, retain, nullable) NSArray *doNotIntrospectClasses;
 
 /** The maximum number of reports allowed on disk before old ones get deleted.
  *
@@ -125,7 +133,7 @@ SENTRY_NO_INIT
  * Note: If you use an installation, it will automatically set this property.
  *       Do not modify it in such a case.
  */
-@property (nonatomic, readwrite, retain) id<SentryCrashReportFilter> sink;
+@property (nonatomic, readwrite, retain, nullable) id<SentryCrashReportFilter> sink;
 
 /** C Function to call during a crash report to give the callee an opportunity
  * to add to the report. NULL = ignore.
@@ -136,7 +144,7 @@ SENTRY_NO_INIT
  * Note: If you use an installation, it will automatically set this property.
  *       Do not modify it in such a case.
  */
-@property (nonatomic, readwrite, assign) SentryCrashReportWriteCallback onCrash;
+@property (nonatomic, readwrite, assign, nullable) SentryCrashReportWriteCallback onCrash;
 
 /** Print the previous app run log to the console when installing SentryCrash.
  *  This is primarily for debugging purposes.
@@ -149,7 +157,7 @@ SENTRY_NO_INIT
 
 /** Exposes the uncaughtExceptionHandler if set from SentryCrash. Is nil if
  * debugger is running. **/
-@property (nonatomic, assign) NSUncaughtExceptionHandler *uncaughtExceptionHandler;
+@property (nonatomic, assign, nullable) NSUncaughtExceptionHandler *uncaughtExceptionHandler;
 
 #pragma mark - Information -
 
@@ -241,6 +249,8 @@ SENTRY_NO_INIT
 
 @end
 
+NS_ASSUME_NONNULL_END
+
 //! Project version number for SentryCrashFramework.
 FOUNDATION_EXPORT const double SentryCrashFrameworkVersionNumber;
 

Sources/Sentry/include/SentryCrashInstallation.h

@@ -30,6 +30,8 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+@class SentryCrashBridge;
+
 /**
  * Crash system installation which handles backend-specific details.
  *
@@ -60,6 +62,10 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (void)sendAllReportsWithCompletion:(nullable SentryCrashReportFilterCompletion)onCompletion;
 
+/** Bridge for accessing SDK services without dependency container.
+ * Must be set by SentryCrashIntegration before calling install. */
+@property (nonatomic, strong) SentryCrashBridge *bridge;
+
 @end
 
 NS_ASSUME_NONNULL_END

Sources/SentryCrash/Installations/SentryCrashInstallation.m

@@ -93,7 +93,7 @@ - (id)initWithRequiredProperties:(NSArray *)requiredProperties
 
 - (void)dealloc
 {
-    SentryCrashSwift *handler = SentryDependencyContainer.sharedInstance.crashReporter;
+    SentryCrashSwift *handler = self.bridge.crashReporter;
     @synchronized(handler) {
         if (g_crashHandlerData == self.crashHandlerData) {
             g_crashHandlerData = NULL;
@@ -162,7 +162,7 @@ - (NSArray *)makeKeyPaths:(NSArray *)keyPaths
 
 - (void)install:(NSString *)customCacheDirectory
 {
-    SentryCrashSwift *handler = SentryDependencyContainer.sharedInstance.crashReporter;
+    SentryCrashSwift *handler = self.bridge.crashReporter;
     @synchronized(handler) {
         handler.basePath = customCacheDirectory;
         g_crashHandlerData = self.crashHandlerData;
@@ -173,7 +173,7 @@ - (void)install:(NSString *)customCacheDirectory
 
 - (void)uninstall
 {
-    SentryCrashSwift *handler = SentryDependencyContainer.sharedInstance.crashReporter;
+    SentryCrashSwift *handler = self.bridge.crashReporter;
     @synchronized(handler) {
         if (g_crashHandlerData == self.crashHandlerData) {
             g_crashHandlerData = NULL;
@@ -204,7 +204,7 @@ - (void)sendAllReportsWithCompletion:(SentryCrashReportFilterCompletion)onComple
 
     sink = [SentryCrashReportFilterPipeline filterWithFilters:sink, nil];
 
-    SentryCrashSwift *handler = SentryDependencyContainer.sharedInstance.crashReporter;
+    SentryCrashSwift *handler = self.bridge.crashReporter;
     handler.sink =
         [[SentryCrashReportFilterSwift alloc] initWithFilterReports:^(NSArray *_Nonnull array,
             void (^_Nonnull completion)(NSArray *_Nullable, BOOL, NSError *_Nullable)) {

Sources/SentryCrash/Recording/Monitors/SentryCrashMonitor_NSException.h

@@ -31,15 +31,24 @@
 #ifndef HDR_SentryCrashMonitor_NSException_h
 #define HDR_SentryCrashMonitor_NSException_h
 
+#ifdef __OBJC__
+@class SentryCrashBridge;
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 #include "SentryCrashMonitor.h"
 
+#ifdef __OBJC__
+/** Set the bridge for accessing SDK services. Must be called before enabling the monitor. */
+void sentrycrashcm_nsexception_setBridge(SentryCrashBridge *_Nullable bridge);
+#endif
+
 /** Access the Monitor API.
  */
-SentryCrashMonitorAPI *sentrycrashcm_nsexception_getAPI(void);
+SentryCrashMonitorAPI *_Nonnull sentrycrashcm_nsexception_getAPI(void);
 
 #ifdef __cplusplus
 }

Sources/SentryCrash/Recording/Monitors/SentryCrashMonitor_NSException.m

@@ -47,6 +47,9 @@
 /** The exception handler that was in place before we installed ours. */
 static NSUncaughtExceptionHandler *g_previousUncaughtExceptionHandler;
 
+/** Bridge for accessing SDK services. */
+static SentryCrashBridge *g_bridge = nil;
+
 // ============================================================================
 #pragma mark - Callbacks -
 // ============================================================================
@@ -113,6 +116,12 @@
 #pragma mark - API -
 // ============================================================================
 
+void
+sentrycrashcm_nsexception_setBridge(SentryCrashBridge *bridge)
+{
+    g_bridge = bridge;
+}
+
 static void
 setEnabled(bool isEnabled)
 {
@@ -124,8 +133,7 @@
 
             SENTRY_LOG_DEBUG(@"Setting new handler.");
             NSSetUncaughtExceptionHandler(&handleUncaughtException);
-            SentryDependencyContainer.sharedInstance.crashReporter.uncaughtExceptionHandler
-                = &handleUncaughtException;
+            g_bridge.crashReporter.uncaughtExceptionHandler = &handleUncaughtException;
         } else {
             SENTRY_LOG_DEBUG(@"Restoring original handler.");
             NSSetUncaughtExceptionHandler(g_previousUncaughtExceptionHandler);