Support sentry SDK Swift

Author: noahsmartin

packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryDependencyContainerTests.h

@@ -2,11 +2,6 @@
 #import <Foundation/Foundation.h>
 #import <RNSentry/RNSentry.h>
 
-@interface
-SentrySDK (PrivateTests)
-- (nullable SentryOptions *)options;
-@end
-
 @interface SentryDependencyContainer : NSObject
 + (instancetype)sharedInstance;
 @property (nonatomic, strong) SentryFramesTracker *framesTracker;

packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryFramesTrackerListenerTests.h

@@ -2,11 +2,6 @@
 #import <Foundation/Foundation.h>
 #import <RNSentry/RNSentry.h>
 
-@interface
-SentrySDK (PrivateTests)
-- (nullable SentryOptions *)options;
-@end
-
 @interface SentryDependencyContainer : NSObject
 + (instancetype)sharedInstance;
 @property (nonatomic, strong) SentryFramesTracker *framesTracker;

packages/core/ios/RNSentry.mm

@@ -57,15 +57,7 @@
 
 #import "RNSentryExperimentalOptions.h"
 #import "RNSentryVersion.h"
-
-@interface
-SentrySDK (RNSentry)
-
-+ (void)captureEnvelope:(SentryEnvelope *)envelope;
-
-+ (void)storeEnvelope:(SentryEnvelope *)envelope;
-
-@end
+#import "SentrySDKWrapper.h"
 
 static bool hasFetchedAppStart;
 
@@ -112,7 +104,7 @@ - (instancetype)init
     [PrivateSentrySDKOnly addSdkPackage:REACT_NATIVE_SDK_PACKAGE_NAME
                                 version:REACT_NATIVE_SDK_PACKAGE_VERSION];
 
-    [SentrySDK startWithOptions:sentryOptions];
+    [SentrySDKWrapper startWithOptions:sentryOptions];
 
 #if TARGET_OS_IPHONE || TARGET_OS_MACCATALYST
     BOOL appIsActive =
@@ -451,7 +443,7 @@ - (NSDictionary *)fetchNativeStackFramesBy:(NSArray<NSNumber *> *)instructionsAd
     __block NSMutableDictionary<NSString *, id> *serializedScope;
     // Temp work around until sorted out this API in sentry-cocoa.
     // TODO: If the callback isnt' executed the promise wouldn't be resolved.
-    [SentrySDK configureScope:^(SentryScope *_Nonnull scope) {
+    [SentrySDKWrapper configureScope:^(SentryScope *_Nonnull scope) {
         serializedScope = [[scope serialize] mutableCopy];
 
         NSDictionary<NSString *, id> *user = [serializedScope valueForKey:@"user"];
@@ -655,7 +647,7 @@ - (NSDictionary *)fetchNativeStackFramesBy:(NSArray<NSNumber *> *)instructionsAd
 
 RCT_EXPORT_METHOD(setUser : (NSDictionary *)userKeys otherUserKeys : (NSDictionary *)userDataKeys)
 {
-    [SentrySDK configureScope:^(SentryScope *_Nonnull scope) {
+    [SentrySDKWrapper configureScope:^(SentryScope *_Nonnull scope) {
         [scope setUser:[RNSentry userFrom:userKeys otherUserKeys:userDataKeys]];
     }];
 }
@@ -704,7 +696,7 @@ + (SentryUser *_Nullable)userFrom:(NSDictionary *)userKeys
 
 RCT_EXPORT_METHOD(addBreadcrumb : (NSDictionary *)breadcrumb)
 {
-    [SentrySDK configureScope:^(SentryScope *_Nonnull scope) {
+    [SentrySDKWrapper configureScope:^(SentryScope *_Nonnull scope) {
         [scope addBreadcrumb:[RNSentryBreadcrumb from:breadcrumb]];
     }];
 
@@ -718,12 +710,12 @@ + (SentryUser *_Nullable)userFrom:(NSDictionary *)userKeys
 
 RCT_EXPORT_METHOD(clearBreadcrumbs)
 {
-    [SentrySDK configureScope:^(SentryScope *_Nonnull scope) { [scope clearBreadcrumbs]; }];
+    [SentrySDKWrapper configureScope:^(SentryScope *_Nonnull scope) { [scope clearBreadcrumbs]; }];
 }
 
 RCT_EXPORT_METHOD(setExtra : (NSString *)key extra : (NSString *)extra)
 {
-    [SentrySDK
+    [SentrySDKWrapper
         configureScope:^(SentryScope *_Nonnull scope) { [scope setExtraValue:extra forKey:key]; }];
 }
 
@@ -733,7 +725,7 @@ + (SentryUser *_Nullable)userFrom:(NSDictionary *)userKeys
         return;
     }
 
-    [SentrySDK configureScope:^(SentryScope *_Nonnull scope) {
+    [SentrySDKWrapper configureScope:^(SentryScope *_Nonnull scope) {
         if (context == nil) {
             [scope removeContextForKey:key];
         } else {
@@ -744,17 +736,17 @@ + (SentryUser *_Nullable)userFrom:(NSDictionary *)userKeys
 
 RCT_EXPORT_METHOD(setTag : (NSString *)key value : (NSString *)value)
 {
-    [SentrySDK
+    [SentrySDKWrapper
         configureScope:^(SentryScope *_Nonnull scope) { [scope setTagValue:value forKey:key]; }];
 }
 
-RCT_EXPORT_METHOD(crash) { [SentrySDK crash]; }
+RCT_EXPORT_METHOD(crash) { [SentrySDKWrapper crash]; }
 
 RCT_EXPORT_METHOD(closeNativeSdk
                   : (RCTPromiseResolveBlock)resolve rejecter
                   : (RCTPromiseRejectBlock)reject)
 {
-    [SentrySDK close];
+    [SentrySDKWrapper close];
     resolve(@YES);
 }
 
@@ -957,7 +949,7 @@ + (SentryUser *_Nullable)userFrom:(NSDictionary *)userKeys
                   : (RCTPromiseResolveBlock)resolve rejecter
                   : (RCTPromiseRejectBlock)reject)
 {
-    resolve(@([SentrySDK crashedLastRun]));
+    resolve(@([SentrySDKWrapper crashedLastRun]));
 }
 
 // Thanks to this guard, we won't compile this code when we build for the old architecture.

packages/core/ios/SentrySDKWrapper.h

@@ -0,0 +1,18 @@
+#import <Foundation/Foundation.h>
+
+@class SentryOptions;
+@class SentryScope;
+
+@interface SentrySDKWrapper : NSObject
+
++ (void)configureScope:(void (^)(SentryScope *scope))callback;
+
++ (void)crash;
+
++ (void)close;
+
++(BOOL)crashedLastRun;
+
++ (void)startWithOptions:(SentryOptions *)options;
+
+@end

packages/core/ios/SentrySDKWrapper.m

@@ -0,0 +1,26 @@
+#import "SentrySDKWrapper.h"
+@import Sentry;
+
+@implementation SentrySDKWrapper
+
++ (void)startWithOptions:(SentryOptions *)options {
+  [SentrySDK startWithOptions:options];
+}
+
++ (void)crash {
+  [SentrySDK crash];
+}
+
++ (void)close {
+  [SentrySDK close];
+}
+
++ (BOOL)crashedLastRun {
+  return [SentrySDK crashedLastRun];
+}
+
++ (void)configureScope:(void (^)(SentryScope *scope))callback {
+  [SentrySDK configureScope:callback];
+}
+
+@end