@sentry/react-native 5.0.0-alpha.9 → 5.0.0-beta.1

package/ios/RNSentry.mm

@@ -9,6 +9,7 @@
 #import <Sentry/Sentry.h>
 #import <Sentry/PrivateSentrySDKOnly.h>
 #import <Sentry/SentryScreenFrames.h>
+#import <Sentry/SentryOptions+HybridSDKs.h>
 
 // Thanks to this guard, we won't import this header when we build for the old architecture.
 #ifdef RCT_NEW_ARCH_ENABLED
@@ -49,7 +50,35 @@ RCT_EXPORT_METHOD(initNativeSdk:(NSDictionary *_Nonnull)options
                   rejecter:(RCTPromiseRejectBlock)reject)
 {
     NSError *error = nil;
+    SentryOptions* sentryOptions = [self createOptionsWithDictionary:options error:&error];
+    if (error != nil) {
+        reject(@"SentryReactNative", error.localizedDescription, error);
+        return;
+    }
+
+    [SentrySDK startWithOptions:sentryOptions];
+
+#if TARGET_OS_IPHONE || TARGET_OS_MACCATALYST
+    BOOL appIsActive = [[UIApplication sharedApplication] applicationState] == UIApplicationStateActive;
+#else
+    BOOL appIsActive = [[NSApplication sharedApplication] isActive];
+#endif
+
+    // If the app is active/in foreground, and we have not sent the SentryHybridSdkDidBecomeActive notification, send it.
+    if (appIsActive && !sentHybridSdkDidBecomeActive && (PrivateSentrySDKOnly.options.enableAutoSessionTracking || PrivateSentrySDKOnly.options.enableWatchdogTerminationTracking)) {
+        [[NSNotificationCenter defaultCenter]
+            postNotificationName:@"SentryHybridSdkDidBecomeActive"
+            object:nil];
 
+        sentHybridSdkDidBecomeActive = true;
+    }
+
+    resolve(@YES);
+}
+
+- (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 react native
         // Because we sent it already before the app crashed.
@@ -73,10 +102,9 @@ RCT_EXPORT_METHOD(initNativeSdk:(NSDictionary *_Nonnull)options
     [mutableOptions removeObjectForKey:@"tracesSampleRate"];
     [mutableOptions removeObjectForKey:@"tracesSampler"];
 
-    SentryOptions *sentryOptions = [[SentryOptions alloc] initWithDict:mutableOptions didFailWithError:&error];
-    if (error) {
-        reject(@"SentryReactNative", error.localizedDescription, error);
-        return;
+    SentryOptions *sentryOptions = [[SentryOptions alloc] initWithDict:mutableOptions didFailWithError:errorPointer];
+    if (*errorPointer != nil) {
+        return nil;
     }
 
     if ([mutableOptions valueForKey:@"enableNativeCrashHandling"] != nil) {
@@ -90,36 +118,16 @@ RCT_EXPORT_METHOD(initNativeSdk:(NSDictionary *_Nonnull)options
     }
 
     // Enable the App start and Frames tracking measurements
-    if ([mutableOptions valueForKey:@"enableAutoPerformanceTracking"] != nil) {
-        BOOL enableAutoPerformanceTracking = (BOOL)[mutableOptions valueForKey:@"enableAutoPerformanceTracking"];
+    if ([mutableOptions valueForKey:@"enableAutoPerformanceTracing"] != nil) {
+        BOOL enableAutoPerformanceTracing = (BOOL)[mutableOptions valueForKey:@"enableAutoPerformanceTracing"];
 
-        PrivateSentrySDKOnly.appStartMeasurementHybridSDKMode = enableAutoPerformanceTracking;
+        PrivateSentrySDKOnly.appStartMeasurementHybridSDKMode = enableAutoPerformanceTracing;
 #if TARGET_OS_IPHONE || TARGET_OS_MACCATALYST
-        PrivateSentrySDKOnly.framesTrackingMeasurementHybridSDKMode = enableAutoPerformanceTracking;
-#endif
-    }
-
-    [SentrySDK startWithOptionsObject:sentryOptions];
-
-#if TARGET_OS_IPHONE || TARGET_OS_MACCATALYST
-    BOOL appIsActive = [[UIApplication sharedApplication] applicationState] == UIApplicationStateActive;
-#else
-    BOOL appIsActive = [[NSApplication sharedApplication] isActive];
+        PrivateSentrySDKOnly.framesTrackingMeasurementHybridSDKMode = enableAutoPerformanceTracing;
 #endif
-
-    // If the app is active/in foreground, and we have not sent the SentryHybridSdkDidBecomeActive notification, send it.
-    if (appIsActive && !sentHybridSdkDidBecomeActive && (PrivateSentrySDKOnly.options.enableAutoSessionTracking || PrivateSentrySDKOnly.options.enableOutOfMemoryTracking)) {
-        [[NSNotificationCenter defaultCenter]
-            postNotificationName:@"SentryHybridSdkDidBecomeActive"
-            object:nil];
-
-        sentHybridSdkDidBecomeActive = true;
     }
 
-
-
-
-    resolve(@YES);
+    return sentryOptions;
 }
 
 - (void)setEventOriginTag:(SentryEvent *)event {
@@ -175,33 +183,27 @@ RCT_EXPORT_METHOD(fetchNativeDeviceContexts:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject)
 {
     NSLog(@"Bridge call to: deviceContexts");
-    NSMutableDictionary<NSString *, id> *contexts = [NSMutableDictionary new];
+    __block NSMutableDictionary<NSString *, id> *contexts;
     // 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) {
-        NSDictionary<NSString *, id> *serializedScope = [scope serialize];
-        // Scope serializes as 'context' instead of 'contexts' as it does for the event.
-        NSDictionary<NSString *, id> *tempContexts = [serializedScope valueForKey:@"context"];
-
-        NSMutableDictionary<NSString *, id> *user = [NSMutableDictionary new];
-
-        NSDictionary<NSString *, id> *tempUser = [serializedScope valueForKey:@"user"];
-        if (tempUser != nil) {
-            [user addEntriesFromDictionary:[tempUser valueForKey:@"user"]];
-        } else {
-            [user setValue:PrivateSentrySDKOnly.installationID forKey:@"id"];
+        NSDictionary<NSString *, id>  *serializedScope = [scope serialize];
+        contexts = [serializedScope mutableCopy];
+
+        NSDictionary<NSString *, id>  *user = [contexts valueForKey:@"user"];
+        if (user == nil) {
+            [contexts
+                setValue:@{ @"id": PrivateSentrySDKOnly.installationID }
+                forKey:@"user"];
         }
-        [contexts setValue:user forKey:@"user"];
 
-        if (tempContexts != nil) {
-            [contexts setValue:tempContexts forKey:@"context"];
-        }
         if (PrivateSentrySDKOnly.options.debug) {
             NSData *data = [NSJSONSerialization dataWithJSONObject:contexts options:0 error:nil];
             NSString *debugContext = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
             NSLog(@"Contexts: %@", debugContext);
         }
     }];
+
     resolve(contexts);
 }
 
@@ -306,6 +308,35 @@ RCT_EXPORT_METHOD(captureEnvelope:(NSArray * _Nonnull)bytes
     resolve(@YES);
 }
 
+RCT_EXPORT_METHOD(captureScreenshot: (RCTPromiseResolveBlock)resolve
+                  rejecter: (RCTPromiseRejectBlock)reject)
+{
+    NSArray<NSData *>* rawScreenshots = [PrivateSentrySDKOnly captureScreenshots];
+    NSMutableArray *screenshotsArray = [NSMutableArray arrayWithCapacity:[rawScreenshots count]];
+
+    int counter = 1;
+    for (NSData* raw in rawScreenshots) {
+        NSMutableArray *screenshot = [NSMutableArray arrayWithCapacity:raw.length];
+        const char *bytes = (char*) [raw bytes];
+        for (int i = 0; i < [raw length]; i++) {
+            [screenshot addObject:[[NSNumber alloc] initWithChar:bytes[i]]];
+        }
+
+        NSString* filename = @"screenshot.png";
+        if (counter > 1) {
+            filename = [NSString stringWithFormat:@"screenshot-%d.png", counter];
+        }
+        [screenshotsArray addObject:@{
+            @"data": screenshot,
+            @"contentType": @"image/png",
+            @"filename": filename,
+        }];
+        counter++;
+    }
+
+    resolve(screenshotsArray);
+}
+
 RCT_EXPORT_METHOD(setUser:(NSDictionary *)userKeys
                   otherUserKeys:(NSDictionary *)userDataKeys
 )
@@ -344,12 +375,12 @@ RCT_EXPORT_METHOD(addBreadcrumb:(NSDictionary *)breadcrumb)
             sentryLevel = kSentryLevelFatal;
         } else if ([levelString isEqualToString:@"warning"]) {
             sentryLevel = kSentryLevelWarning;
-        } else if ([levelString isEqualToString:@"info"]) {
-            sentryLevel = kSentryLevelInfo;
+        } else if ([levelString isEqualToString:@"error"]) {
+            sentryLevel = kSentryLevelError;
         } else if ([levelString isEqualToString:@"debug"]) {
             sentryLevel = kSentryLevelDebug;
         } else {
-            sentryLevel = kSentryLevelError;
+            sentryLevel = kSentryLevelInfo;
         }
         [breadcrumbInstance setLevel:sentryLevel];
 
@@ -419,7 +450,7 @@ RCT_EXPORT_METHOD(enableNativeFramesTracking)
 {
     // Do nothing on iOS, this bridge method only has an effect on android.
     // If you're starting the Cocoa SDK manually,
-    // you can set the 'enableAutoPerformanceTracking: true' option and
+    // you can set the 'enableAutoPerformanceTracing: true' option and
     // the 'tracesSampleRate' or 'tracesSampler' option.
 }
 

package/package.json

@@ -2,7 +2,7 @@
   "name": "@sentry/react-native",
   "homepage": "https://github.com/getsentry/sentry-react-native",
   "repository": "https://github.com/getsentry/sentry-react-native",
-  "version": "5.0.0-alpha.9",
+  "version": "5.0.0-beta.1",
   "description": "Official Sentry SDK for react-native",
   "typings": "dist/js/index.d.ts",
   "types": "dist/js/index.d.ts",
@@ -17,7 +17,7 @@
     "build:tools": "tsc -p tsconfig.build.tools.json",
     "clean": "rimraf dist coverage",
     "test": "jest",
-    "lint": "eslint .",
+    "lint": "eslint --config .eslintrc.js .",
     "test:watch": "jest --watch",
     "run-ios": "cd sample && yarn react-native run-ios",
     "run-android": "cd sample && yarn react-native run-android"
@@ -39,38 +39,38 @@
   ],
   "peerDependencies": {
     "react": ">=17.0.0",
-    "react-native": ">=0.70.0"
+    "react-native": ">=0.65.0"
   },
   "dependencies": {
-    "@sentry/browser": "7.21.1",
-    "@sentry/cli": "2.7.0",
-    "@sentry/core": "7.21.1",
-    "@sentry/hub": "7.21.1",
-    "@sentry/integrations": "7.21.1",
-    "@sentry/react": "7.21.1",
-    "@sentry/tracing": "7.21.1",
-    "@sentry/types": "7.21.1",
-    "@sentry/utils": "7.21.1"
+    "@sentry/browser": "7.32.1",
+    "@sentry/cli": "2.10.0",
+    "@sentry/core": "7.32.1",
+    "@sentry/hub": "7.32.1",
+    "@sentry/integrations": "7.32.1",
+    "@sentry/react": "7.32.1",
+    "@sentry/tracing": "7.32.1",
+    "@sentry/types": "7.32.1",
+    "@sentry/utils": "7.32.1"
   },
   "devDependencies": {
-    "@sentry-internal/eslint-config-sdk": "7.21.1",
-    "@sentry-internal/eslint-plugin-sdk": "7.21.1",
+    "@sentry-internal/eslint-config-sdk": "7.32.1",
+    "@sentry-internal/eslint-plugin-sdk": "7.32.1",
     "@sentry/typescript": "^5.20.1",
     "@sentry/wizard": "2.2.0",
-    "@types/jest": "^26.0.15",
+    "@types/jest": "^29.2.5",
     "@types/react": "^18.0.25",
-    "@types/react-native": "^0.70.6",
-    "babel-jest": "^26.1.0",
+    "babel-jest": "^29.3.1",
     "eslint": "^7.6.0",
     "eslint-plugin-react": "^7.20.6",
     "eslint-plugin-react-native": "^3.8.1",
-    "jest": "^24.9.0",
+    "jest": "^29.3.1",
+    "jest-environment-jsdom": "^29.4.1",
     "prettier": "^2.0.5",
-    "react": "^18.2.0",
-    "react-native": "^0.70.5",
+    "react": "18.2.0",
+    "react-native": "0.71.0",
     "replace-in-file": "^6.0.0",
-    "rimraf": "^3.0.0",
-    "ts-jest": "^24.3.0",
+    "rimraf": "^4.1.1",
+    "ts-jest": "^29.0.5",
     "typescript": "3.8.3"
   },
   "rnpm": {
@@ -97,7 +97,8 @@
       "js"
     ],
     "testPathIgnorePatterns": [
-      "<rootDir>/sample/"
+      "<rootDir>/sample/",
+      "<rootDir>/test/e2e/"
     ],
     "testEnvironment": "node",
     "testMatch": [

package/scripts/collect-modules.sh

@@ -40,4 +40,4 @@ else
   modulesPaths="$MODULES_PATHS"
 fi
 
-$nodePath $collectModulesScript $sourceMap $modulesOutput $modulesPaths
+$nodePath "$collectModulesScript" "$sourceMap" "$modulesOutput" "$modulesPaths"

package/sentry.gradle

@@ -34,13 +34,16 @@ gradle.projectsEvaluated {
     // separately we then hook into the bundle task of react native to inject
     // sourcemap generation parameters.  In case for whatever reason no release
     // was found for the asset folder we just bail.
-    def bundleTasks = tasks.findAll { task -> task.name.startsWith("bundle") && task.name.endsWith("JsAndAssets") && !task.name.contains("Debug") && task.enabled }
+    def bundleTasks = tasks.findAll { task -> (task.name.startsWith("createBundle") || task.name.startsWith("bundle")) && task.name.endsWith("JsAndAssets") && !task.name.contains("Debug") && task.enabled }
     bundleTasks.each { bundleTask ->
         def shouldCleanUp
         def sourcemapOutput
         def bundleOutput
         def props = bundleTask.getProperties()
         def reactRoot = props.get("workingDir")
+        if (reactRoot == null) {
+            reactRoot = props.get("root").get() // RN 0.71 and above
+        }
         def modulesOutput = "$reactRoot/android/app/src/main/assets/modules.json"
         def modulesTask = null
 
@@ -194,19 +197,24 @@ gradle.projectsEvaluated {
           }
           previousCliTask = cliTask
           cliTask.finalizedBy modulesTask
+        }
 
-          def modulesCleanUpTask = tasks.create(name: nameModulesCleanup, type: Delete) {
-              description = "clean up collected modules generated file"
-              group = 'sentry.io'
+        def modulesCleanUpTask = tasks.create(name: nameModulesCleanup, type: Delete) {
+            description = "clean up collected modules generated file"
+            group = 'sentry.io'
 
-              delete modulesOutput
-          }
+            delete modulesOutput
+        }
 
-          def packageTasks = tasks.findAll { task -> "package${variant}".equalsIgnoreCase(task.name) && task.enabled }
-          packageTasks.each { packageTask ->
-              packageTask.dependsOn modulesTask
-              packageTask.finalizedBy modulesCleanUpTask
-          }
+        def variantTaskName = variant.replaceAll("[\\s\\-()]", "") // variant is dev-release beta-release etc.
+        // task.name could be packageDev-debugRelease but in that case currentVariants == null
+        // because of the regex in `extractCurrentVariants` and this code doesn't run
+        def packageTasks = tasks.findAll {
+          task -> "package${variantTaskName}".equalsIgnoreCase(task.name) && task.enabled
+        }
+        packageTasks.each { packageTask ->
+            packageTask.dependsOn modulesTask
+            packageTask.finalizedBy modulesCleanUpTask
         }
 
         /** Delete sourcemap files */
@@ -251,7 +259,7 @@ def extractReleasesInfo() {
 }
 
 /** Extract from arguments collection bundle and sourcemap files output names. */
-static extractBundleTaskArguments(cmdArgs, Project project) {
+static extractBundleTaskArgumentsLegacy(cmdArgs, Project project) {
     def bundleOutput = null
     def sourcemapOutput = null
 
@@ -295,6 +303,26 @@ static extractBundleTaskArguments(cmdArgs, Project project) {
     return [bundleOutput, sourcemapOutput]
 }
 
+/** Extract bundle and sourcemap paths from bundle task props.
+  * Based on https://github.dev/facebook/react-native/blob/473eb1dd870a4f62c4ebcba27e12bde1e99e3d07/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/BundleHermesCTask.kt#L109
+  * Output source map path is the same for both Hermes and JSC.
+  */
+static extractBundleTaskArgumentsRN71AndAbove(bundleTask, logger) {
+    def props = bundleTask.getProperties()
+    def bundleAssetName = props.bundleAssetName?.get()
+
+    if (bundleAssetName == null) {
+        return [null, null]
+    }
+
+    def bundleFile = new File(props.jsBundleDir.get().asFile.absolutePath, bundleAssetName)
+    def outputSourceMap = new File(props.jsSourceMapsDir.get().asFile.absolutePath, "${bundleAssetName}.map")
+
+    logger.info("bundleFile: `${bundleFile}`")
+    logger.info("outputSourceMap: `${outputSourceMap}`")
+    return [bundleFile, outputSourceMap]
+}
+
 /** Force Bundle task to produce sourcemap files if they are not pre-configured by user yet. */
 def forceSourceMapOutputFromBundleTask(bundleTask) {
     def props = bundleTask.getProperties()
@@ -304,7 +332,10 @@ def forceSourceMapOutputFromBundleTask(bundleTask) {
     def bundleOutput = null
     def sourcemapOutput = null
 
-    (bundleOutput, sourcemapOutput) = extractBundleTaskArguments(cmdArgs, project)
+    (bundleOutput, sourcemapOutput) = extractBundleTaskArgumentsRN71AndAbove(bundleTask, logger)
+    if (bundleOutput == null) {
+        (bundleOutput, sourcemapOutput) = extractBundleTaskArgumentsLegacy(cmdArgs, project)
+    }
 
     if (sourcemapOutput == null) {
         sourcemapOutput = bundleOutput + ".map"
@@ -327,8 +358,8 @@ def forceSourceMapOutputFromBundleTask(bundleTask) {
 
 /** compose array with one item - current build flavor name */
 static extractCurrentVariants(bundleTask, releases) {
-    // examples: bundleLocalReleaseJsAndAssets, bundleYellowDebugJsAndAssets
-    def pattern = Pattern.compile("bundle([A-Z][A-Za-z0-9_]+)JsAndAssets")
+    // examples: bundleLocalReleaseJsAndAssets, createBundleYellowDebugJsAndAssets
+    def pattern = Pattern.compile("(?:create)?(?:B|b)undle([A-Z][A-Za-z0-9_]+)JsAndAssets")
 
     def currentRelease = ""
 

package/src/js/NativeRNSentry.ts

@@ -1,5 +1,6 @@
-import { Package } from '@sentry/types';
-import { TurboModule, TurboModuleRegistry } from 'react-native';
+import type { Package } from '@sentry/types';
+import type { TurboModule} from 'react-native';
+import { TurboModuleRegistry } from 'react-native';
 import type { UnsafeObject } from 'react-native/Libraries/Types/CodegenTypes';
 
 // There has to be only one interface and it has to be named `Spec`
@@ -12,6 +13,7 @@ export interface Spec extends TurboModule {
       store: boolean,
     },
   ): Promise<boolean>;
+  captureScreenshot(): Promise<NativeScreenshot[]>;
   clearBreadcrumbs(): void;
   crash(): void;
   closeNativeSdk(): Promise<void>;
@@ -51,9 +53,42 @@ export type NativeReleaseResponse = {
   version: string;
 };
 
+/**
+ * This type describes serialized scope from sentry-cocoa. (This is not used for Android)
+ * https://github.com/getsentry/sentry-cocoa/blob/master/Sources/Sentry/SentryScope.m
+ */
 export type NativeDeviceContextsResponse = {
-  [key: string]: Record<string, unknown>;
+  [key: string]: unknown;
+  tags?: Record<string, string>;
+  extra?: Record<string, unknown>;
+  context?: Record<string, Record<string, unknown>>;
+  user?: {
+    userId?: string;
+    email?: string;
+    username?: string;
+    ipAddress?: string;
+    segment?: string;
+    data?: Record<string, unknown>;
+  };
+  dist?: string;
+  environment?: string;
+  fingerprint?: string[];
+  level?: string;
+  breadcrumbs?: {
+    level?: string;
+    timestamp?: string;
+    category?: string;
+    type?: string;
+    message?: string;
+    data?: Record<string, unknown>;
+  }[];
 };
 
+export type NativeScreenshot = {
+  data: number[];
+  contentType: string;
+  filename: string;
+}
+
 // The export must be here to pass codegen even if not used
 export default TurboModuleRegistry.getEnforcing<Spec>('RNSentry');