Bump sentry-cocoa/ fix issue 311

CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog
 
+## Unreleased
+
+### Fixes
+
+-  Fix iOS not bundling ([#316](https://github.com/getsentry/sentry-cordova/pull/316))
+
+### Dependencies
+
+- Bump `sentry-wizard` to 3.10.0 ([#316](https://github.com/getsentry/sentry-cordova/pull/316))
+- build(ios): Bump `sentry-cocoa` to 8.9.3 ([#316](https://github.com/getsentry/sentry-cordova/pull/316))
+  - [changelog](https://github.com/getsentry/sentry-cocoa/releases/tag/7.27.1)
+  - [diff](https://github.com/getsentry/sentry-cocoa/compare/7.27.1...8.9.3)
+
+### Warning, breaking changes
+
+- The option `enableOutOfMemoryTracking` is now `enableWatchdogTerminationTracking`. The previous name will keep working but will be removed on a major version.
+- Bump minimum supported OS versions to macOS 10.13, iOS 11.
+
 ## 1.1.5
 
 ### Fixes

Makefile

@@ -1,2 +1,2 @@
 build:
-	cd src/ios; carthage update --use-xcframeworks; carthage build --use-xcframeworks --no-use-binaries
+	cd src/ios; carthage update --use-xcframeworks --platform ios; carthage build --use-xcframeworks --no-use-binaries --platform ios; rm -r Carthage/Build/SentrySwiftUI.xcframework

package.json

@@ -29,7 +29,7 @@
     "@sentry/hub": "7.34.0",
     "@sentry/types": "7.34.0",
     "@sentry/utils": "7.34.0",
-    "@sentry/wizard": "^1.1.4"
+    "@sentry/wizard": "^3.10.0"
   },
   "devDependencies": {
     "@sentry-internal/eslint-config-sdk": "7.34.0",

plugin.xml

@@ -59,6 +59,7 @@
         <!-- We don't have a resource-file here since this adds it to Xcode project -->
 
         <framework src="src/ios/Carthage/Build/Sentry.xcframework" custom="true" embed="true" />
+        <framework src="src/ios/Carthage/Build/SentryPrivate.xcframework" custom="true" embed="true" />
     </platform>
 
     <!-- browser -->

scripts/plugin_add_rm.js

@@ -1,9 +1,9 @@
-module.exports = function(ctx) {
+module.exports = function (ctx) {
   try {
     if (!ctx.opts.plugins.some(plugin => plugin.includes('sentry-cordova'))) {
       return;
     }
-  } catch (e) {}
+  } catch (e) { }
 
   console.log(`Sentry: running ${ctx.hook} - set SENTRY_SKIP_WIZARD=true to skip this`);
 

src/ios/Cartfile

@@ -1 +1 @@
-github "getsentry/sentry-cocoa" "7.27.1"
+github "getsentry/sentry-cocoa" "8.9.3"

src/ios/SentryCordova.m

@@ -1,6 +1,7 @@
 #import "SentryCordova.h"
 #import <Sentry/Sentry.h>
 #import <Sentry/PrivateSentrySDKOnly.h>
+#import <Sentry/SentryOptions+HybridSDKs.h>
 #import <Cordova/CDVAvailability.h>
 @import Sentry;
 
@@ -25,8 +26,11 @@ - (void)startWithOptions:(CDVInvokedUrlCommand *)command {
 
   NSError *error = nil;
 
-  SentryOptions *sentryOptions = [[SentryOptions alloc] initWithDict:options
-                                                    didFailWithError:&error];
+    SentryOptions* sentryOptions = [self createOptionsWithDictionary:options error:&error];
+    if (error != nil) {
+        NSLog(@"%@", error);
+        return;
+    }
 
   CDVPluginResult *result =
       [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsBool:YES];
@@ -35,7 +39,7 @@ - (void)startWithOptions:(CDVInvokedUrlCommand *)command {
     result = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR
                                  messageAsBool:NO];
   } else {
-    [SentrySDK startWithOptionsObject:sentryOptions];
+      [SentrySDK startWithOptions:sentryOptions];
 
     // If the app is active/in foreground, and we have not sent the
     // SentryHybridSdkDidBecomeActive notification, send it.
@@ -54,6 +58,60 @@ - (void)startWithOptions:(CDVInvokedUrlCommand *)command {
   [self.commandDelegate sendPluginResult:result callbackId:command.callbackId];
 }
 
+- (SentryOptions *_Nullable)createOptionsWithDictionary:(NSDictionary *_Nonnull)options
+                                         error: (NSError *_Nonnull *_Nonnull) errorPointer
+{
+    SentryBeforeSendEventCallback beforeSend = ^SentryEvent*(SentryEvent *event) {
+        // We don't want to send an event after startup that came from a Unhandled JS Exception of Cordova
+        // Because we sent it already before the app crashed.
+        if (nil != event.exceptions.firstObject.type &&
+            [event.exceptions.firstObject.type rangeOfString:@"Unhandled JS Exception"].location != NSNotFound) {
+            NSLog(@"Unhandled JS Exception");
+            return nil;
+        }
+
+        [self setEventOriginTag:event];
+
+        return event;
+    };
+
+    NSMutableDictionary * mutableOptions =[options mutableCopy];
+    [mutableOptions setValue:beforeSend forKey:@"beforeSend"];
+
+    // remove performance traces sample rate and traces sampler since we don't want to synchronize these configurations
+    // to the Native SDKs.
+    // The user could tho initialize the SDK manually and set themselves.
+    [mutableOptions removeObjectForKey:@"tracesSampleRate"];
+    [mutableOptions removeObjectForKey:@"tracesSampler"];
+    [mutableOptions removeObjectForKey:@"enableTracing"];
+
+    SentryOptions *sentryOptions = [[SentryOptions alloc] initWithDict:mutableOptions didFailWithError:errorPointer];
+    if (*errorPointer != nil) {
+        return nil;
+    }
+
+    if ([mutableOptions valueForKey:@"enableNativeCrashHandling"] != nil) {
+        BOOL enableNativeCrashHandling = [mutableOptions[@"enableNativeCrashHandling"] boolValue];
+
+        if (!enableNativeCrashHandling) {
+            NSMutableArray *integrations = sentryOptions.integrations.mutableCopy;
+            [integrations removeObject:@"SentryCrashIntegration"];
+            sentryOptions.integrations = integrations;
+        }
+    }
+
+    // Enable the App start and Frames tracking measurements
+    if ([mutableOptions valueForKey:@"enableAutoPerformanceTracing"] != nil) {
+        BOOL enableAutoPerformanceTracing = [mutableOptions[@"enableAutoPerformanceTracing"] boolValue];
+        PrivateSentrySDKOnly.appStartMeasurementHybridSDKMode = enableAutoPerformanceTracing;
+#if TARGET_OS_IPHONE || TARGET_OS_MACCATALYST
+        PrivateSentrySDKOnly.framesTrackingMeasurementHybridSDKMode = enableAutoPerformanceTracing;
+#endif
+    }
+
+    return sentryOptions;
+}
+
 - (void)setEventOriginTag:(SentryEvent *)event {
   if (event.sdk != nil) {
     NSString *sdkName = event.sdk[@"name"];

src/js/options.ts

@@ -39,5 +39,15 @@ export interface CordovaOptions
   *
   * @default true
   * */
+  enableWatchdogTerminationTracking?: boolean;
+
+  /**
+  * Enables Out of Memory Tracking for iOS and macCatalyst.
+  * See the following link for more information and possible restrictions:
+  * https://docs.sentry.io/platforms/apple/guides/ios/configuration/out-of-memory/
+  *
+  * @default true
+  * @deprecated The method will be removed on a major update, instead, use enableWatchdogTerminationTracking for the same result.
+  * */
   enableOutOfMemoryTracking?: boolean;
 }

src/js/sdk.ts

@@ -22,9 +22,14 @@ export function init(options: Partial<CordovaOptions>): void {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any, deprecation/deprecation
   const window = getGlobalObject<{ SENTRY_RELEASE?: { id?: string } }>();
 
+  if (options.enableWatchdogTerminationTracking !== null) {
+    // eslint-disable-next-line deprecation/deprecation
+    options.enableWatchdogTerminationTracking = options.enableOutOfMemoryTracking;
+  }
+
   const finalOptions = {
     enableAutoSessionTracking: true,
-    enableOutOfMemoryTracking: true,
+    enableWatchdogTerminationTracking: true,
     ...DEFAULT_OPTIONS,
     release: window?.SENTRY_RELEASE?.id,
     ...options,