@sentry/react-native 5.9.2 → 5.11.0

package/sentry.gradle

@@ -3,6 +3,10 @@ import org.apache.tools.ant.taskdefs.condition.Os
 import java.util.regex.Matcher
 import java.util.regex.Pattern
 
+project.ext.shouldSentryAutoUpload = { ->
+  return System.getenv('SENTRY_DISABLE_AUTO_UPLOAD') != 'true'
+}
+
 def config = project.hasProperty("sentryCli") ? project.sentryCli : [];
 
 gradle.projectsEvaluated {
@@ -39,6 +43,8 @@ gradle.projectsEvaluated {
         def shouldCleanUp
         def sourcemapOutput
         def bundleOutput
+        def packagerSourcemapOutput
+        def bundleCommand
         def props = bundleTask.getProperties()
         def reactRoot = props.get("workingDir")
         if (reactRoot == null) {
@@ -47,7 +53,7 @@ gradle.projectsEvaluated {
         def modulesOutput = "$reactRoot/android/app/src/main/assets/modules.json"
         def modulesTask = null
 
-        (shouldCleanUp, bundleOutput, sourcemapOutput) = forceSourceMapOutputFromBundleTask(bundleTask)
+        (shouldCleanUp, bundleOutput, sourcemapOutput, packagerSourcemapOutput, bundleCommand) = forceSourceMapOutputFromBundleTask(bundleTask)
 
         // Lets leave this here if we need to debug
         // println bundleTask.properties
@@ -94,71 +100,108 @@ gradle.projectsEvaluated {
           try { tasks.named(nameCliTask); return } catch (Exception e) {}
 
           /** Upload source map file to the sentry server via CLI call. */
-          def cliTask = tasks.create(nameCliTask, Exec) {
+          def cliTask = tasks.create(nameCliTask) {
+              onlyIf { shouldSentryAutoUpload() }
               description = "upload debug symbols to sentry"
               group = 'sentry.io'
 
-              workingDir reactRoot
-
-              def propertiesFile = config.sentryProperties
-                      ? config.sentryProperties
-                      : "$reactRoot/android/sentry.properties"
-
-              if (config.flavorAware) {
-                  propertiesFile = "$reactRoot/android/sentry-${variant}.properties"
-                  project.logger.info("For $variant using: $propertiesFile")
-              } else {
-                  environment("SENTRY_PROPERTIES", propertiesFile)
+              def extraArgs = []
+
+              def sentryPackage = resolveSentryReactNativeSDKPath(reactRoot)
+              def copyDebugIdScript = config.copyDebugIdScript
+                  ? file(config.copyDebugIdScript).getAbsolutePath()
+                  : "$sentryPackage/scripts/copy-debugid.js"
+              def hasSourceMapDebugIdScript = config.hasSourceMapDebugIdScript
+                  ? file(config.hasSourceMapDebugIdScript).getAbsolutePath()
+                  : "$sentryPackage/scripts/has-sourcemap-debugid.js"
+
+              doFirst {
+                  // Copy Debug ID from packager source map to Hermes composed source map
+                  exec {
+                      def args = ["node",
+                          copyDebugIdScript,
+                          packagerSourcemapOutput,
+                          sourcemapOutput]
+                      def osCompatibilityCopyCommand = Os.isFamily(Os.FAMILY_WINDOWS) ? ['cmd', '/c'] : []
+                      commandLine(*osCompatibilityCopyCommand, *args)
+                  }
+
+                  // Add release and dist for backward compatibility if no Debug ID detected in output soruce map
+                  def process = ["node", hasSourceMapDebugIdScript, sourcemapOutput].execute(null, new File("$reactRoot"))
+                  project.logger.lifecycle("Check generated source map for Debug ID: ${process.text}")
+                  def notIncludeRelease = "$bundleCommand" == "bundle" && process.exitValue() == 0
+                  def not = notIncludeRelease ? 'not ' : ''
+                  project.logger.lifecycle("Sentry Source Maps upload will ${not}include the release name and dist.")
+                  extraArgs.addAll(notIncludeRelease ? [] : [
+                      "--release", releaseName,
+                      "--dist", versionCode
+                  ])
               }
 
-              Properties sentryProps = new Properties()
-              try {
-                  sentryProps.load(new FileInputStream(propertiesFile))
-              } catch (FileNotFoundException e) {
-                  project.logger.info("file not found '$propertiesFile' for '$variant'")
+              doLast {
+                  exec {
+                      workingDir reactRoot
+
+                      def propertiesFile = config.sentryProperties
+                        ? config.sentryProperties
+                        : "$reactRoot/android/sentry.properties"
+
+                      if (config.flavorAware) {
+                          propertiesFile = "$reactRoot/android/sentry-${variant}.properties"
+                          project.logger.info("For $variant using: $propertiesFile")
+                      } else {
+                          environment("SENTRY_PROPERTIES", propertiesFile)
+                      }
+
+                      Properties sentryProps = new Properties()
+                      try {
+                          sentryProps.load(new FileInputStream(propertiesFile))
+                      } catch (FileNotFoundException e) {
+                          project.logger.info("file not found '$propertiesFile' for '$variant'")
+                      }
+
+                      def resolvedCliPackage = null
+                      try {
+                          resolvedCliPackage = new File(["node", "--print", "require.resolve('@sentry/cli/package.json')"].execute(null, rootDir).text.trim()).getParentFile();
+                      } catch (Throwable ignored) {}
+                      def cliPackage = resolvedCliPackage != null && resolvedCliPackage.exists() ? resolvedCliPackage.getAbsolutePath() : "$reactRoot/node_modules/@sentry/cli"
+                      def cliExecutable = sentryProps.get("cli.executable", "$cliPackage/bin/sentry-cli")
+
+                      // fix path separator for Windows
+                      if (Os.isFamily(Os.FAMILY_WINDOWS)) {
+                          cliExecutable = cliExecutable.replaceAll("/", "\\\\")
+                      }
+
+                      //
+                      // based on:
+                      //   https://github.com/getsentry/sentry-cli/blob/master/src/commands/react_native_gradle.rs
+                      //
+                      def args = [cliExecutable]
+
+                      args.addAll(!config.logLevel ? [] : [
+                          "--log-level", config.logLevel      // control verbosity of the output
+                      ])
+                      args.addAll(!config.flavorAware ? [] : [
+                          "--url", sentryProps.get("defaults.url"),
+                          "--auth-token", sentryProps.get("auth.token")
+                      ])
+                      args.addAll(["react-native", "gradle",
+                          "--bundle", bundleOutput,           // The path to a bundle that should be uploaded.
+                          "--sourcemap", sourcemapOutput      // The path to a sourcemap that should be uploaded.
+                      ])
+                      args.addAll(!config.flavorAware ? [] : [
+                          "--org", sentryProps.get("defaults.org"),
+                          "--project", sentryProps.get("defaults.project")
+                      ])
+
+                      args.addAll(extraArgs)
+
+                      project.logger.lifecycle("Sentry-CLI arguments: ${args}")
+                      def osCompatibility = Os.isFamily(Os.FAMILY_WINDOWS) ? ['cmd', '/c', 'node'] : []
+                      commandLine(*osCompatibility, *args)
+                  }
               }
 
-              def resolvedCliPackage = null
-              try {
-                  resolvedCliPackage = new File(["node", "--print", "require.resolve('@sentry/cli/package.json')"].execute(null, rootDir).text.trim()).getParentFile();
-              } catch (Throwable ignored) {}
-              def cliPackage = resolvedCliPackage != null && resolvedCliPackage.exists() ? resolvedCliPackage.getAbsolutePath() : "$reactRoot/node_modules/@sentry/cli"
-              def cliExecutable = sentryProps.get("cli.executable", "$cliPackage/bin/sentry-cli")
-
-              // fix path separator for Windows
-              if (Os.isFamily(Os.FAMILY_WINDOWS)) {
-                  cliExecutable = cliExecutable.replaceAll("/", "\\\\")
-              }
-
-              //
-              // based on:
-              //   https://github.com/getsentry/sentry-cli/blob/master/src/commands/react_native_gradle.rs
-              //
-              def args = [cliExecutable]
-
-              args.addAll(!config.logLevel ? [] : [
-                      "--log-level", config.logLevel      // control verbosity of the output
-              ])
-              args.addAll(!config.flavorAware ? [] : [
-                      "--url", sentryProps.get("defaults.url"),
-                      "--auth-token", sentryProps.get("auth.token")
-              ])
-              args.addAll(["react-native", "gradle",
-                           "--bundle", bundleOutput,           // The path to a bundle that should be uploaded.
-                           "--sourcemap", sourcemapOutput,     // The path to a sourcemap that should be uploaded.
-                           "--release", releaseName,            // The name of the release to publish.
-                           "--dist", versionCode
-              ])
-              args.addAll(!config.flavorAware ? [] : [
-                      "--org", sentryProps.get("defaults.org"),
-                      "--project", sentryProps.get("defaults.project")
-              ])
-
-              project.logger.info("Sentry-CLI arguments: ${args}")
-
-              def osCompatibility = Os.isFamily(Os.FAMILY_WINDOWS) ? ['cmd', '/c', 'node'] : []
-              commandLine(*osCompatibility, *args)
-
               enabled true
           }
 
@@ -168,11 +211,7 @@ gradle.projectsEvaluated {
 
               workingDir reactRoot
 
-              def resolvedSentryPath = null
-              try {
-                  resolvedSentryPath = new File(["node", "--print", "require.resolve('@sentry/react-native/package.json')"].execute(null, rootDir).text.trim()).getParentFile();
-              } catch (Throwable ignored) {} // if the resolve fails we fallback to the default path
-              def sentryPackage = resolvedSentryPath != null && resolvedSentryPath.exists() ? resolvedSentryPath.getAbsolutePath() : "$reactRoot/node_modules/@sentry/react-native"
+              def sentryPackage = resolveSentryReactNativeSDKPath(reactRoot)
 
               def collectModulesScript = config.collectModulesScript
                   ? file(config.collectModulesScript).getAbsolutePath()
@@ -248,6 +287,15 @@ gradle.projectsEvaluated {
     }
 }
 
+def resolveSentryReactNativeSDKPath(reactRoot) {
+    def resolvedSentryPath = null
+    try {
+        resolvedSentryPath = new File(["node", "--print", "require.resolve('@sentry/react-native/package.json')"].execute(null, rootDir).text.trim()).getParentFile();
+    } catch (Throwable ignored) {} // if the resolve fails we fallback to the default path
+    def sentryPackage = resolvedSentryPath != null && resolvedSentryPath.exists() ? resolvedSentryPath.getAbsolutePath() : "$reactRoot/node_modules/@sentry/react-native"
+    return sentryPackage
+}
+
 /** Compose lookup map of build variants - to - outputs. */
 def extractReleasesInfo() {
     def releases = [:]
@@ -275,6 +323,8 @@ def extractReleasesInfo() {
 static extractBundleTaskArgumentsLegacy(cmdArgs, Project project) {
     def bundleOutput = null
     def sourcemapOutput = null
+    def packagerSourcemapOutput = null
+    // packagerBundleOutput doesn't exist, because packager output is overwritten by Hermes
 
     cmdArgs.eachWithIndex { String arg, int i ->
         if (arg == "--bundle-output") {
@@ -282,6 +332,7 @@ static extractBundleTaskArgumentsLegacy(cmdArgs, Project project) {
             project.logger.info("--bundle-output: `${bundleOutput}`")
         } else if (arg == "--sourcemap-output") {
             sourcemapOutput = cmdArgs[i + 1]
+            packagerSourcemapOutput = sourcemapOutput
             project.logger.info("--sourcemap-output param: `${sourcemapOutput}`")
         }
     }
@@ -313,7 +364,11 @@ static extractBundleTaskArgumentsLegacy(cmdArgs, Project project) {
         }
     }
 
-    return [bundleOutput, sourcemapOutput]
+    // get the current bundle command, if not peresent use default plain "bundle"
+    // we use this later to decide how to upload source maps
+    def bundleCommand = project.ext.react.get("bundleCommand", "bundle")
+
+    return [bundleOutput, sourcemapOutput, packagerSourcemapOutput, bundleCommand]
 }
 
 /** Extract bundle and sourcemap paths from bundle task props.
@@ -328,12 +383,15 @@ static extractBundleTaskArgumentsRN71AndAbove(bundleTask, logger) {
         return [null, null]
     }
 
+    def bundleCommand = props.bundleCommand.get()
     def bundleFile = new File(props.jsBundleDir.get().asFile.absolutePath, bundleAssetName)
     def outputSourceMap = new File(props.jsSourceMapsDir.get().asFile.absolutePath, "${bundleAssetName}.map")
+    def packagerOutputSourceMap = new File(props.jsIntermediateSourceMapsDir.get().asFile.absolutePath, "${bundleAssetName}.packager.map")
 
     logger.info("bundleFile: `${bundleFile}`")
     logger.info("outputSourceMap: `${outputSourceMap}`")
-    return [bundleFile, outputSourceMap]
+    logger.info("packagerOutputSourceMap: `${packagerOutputSourceMap}`")
+    return [bundleFile, outputSourceMap, packagerOutputSourceMap, bundleCommand]
 }
 
 /** Force Bundle task to produce sourcemap files if they are not pre-configured by user yet. */
@@ -344,10 +402,12 @@ def forceSourceMapOutputFromBundleTask(bundleTask) {
     def shouldCleanUp = false
     def bundleOutput = null
     def sourcemapOutput = null
+    def packagerSourcemapOutput = null
+    def bundleCommand = null
 
-    (bundleOutput, sourcemapOutput) = extractBundleTaskArgumentsRN71AndAbove(bundleTask, logger)
+    (bundleOutput, sourcemapOutput, packagerSourcemapOutput, bundleCommand) = extractBundleTaskArgumentsRN71AndAbove(bundleTask, logger)
     if (bundleOutput == null) {
-        (bundleOutput, sourcemapOutput) = extractBundleTaskArgumentsLegacy(cmdArgs, project)
+        (bundleOutput, sourcemapOutput, packagerSourcemapOutput, bundleCommand) = extractBundleTaskArgumentsLegacy(cmdArgs, project)
     }
 
     if (sourcemapOutput == null) {
@@ -366,7 +426,7 @@ def forceSourceMapOutputFromBundleTask(bundleTask) {
         project.logger.info("Info: used pre-configured source map files: ${sourcemapOutput}")
     }
 
-    return [shouldCleanUp, bundleOutput, sourcemapOutput]
+    return [shouldCleanUp, bundleOutput, sourcemapOutput, packagerSourcemapOutput, bundleCommand]
 }
 
 /** compose array with one item - current build flavor name */

package/ts3.8/dist/js/integrations/reactnativeinfo.d.ts

@@ -7,6 +7,7 @@ export interface ReactNativeContext extends Context {
     hermes_version?: string;
     react_native_version: string;
     component_stack?: string;
+    hermes_debug_info?: boolean;
 }
 /** Loads React Native context at runtime */
 export declare class ReactNativeInfo implements Integration {

package/ts3.8/dist/js/integrations/screenshot.d.ts

@@ -1,4 +1,4 @@
-import type { EventHint, Integration } from '@sentry/types';
+import type { EventHint, EventProcessor, Integration } from '@sentry/types';
 /** Adds screenshots to error events */
 export declare class Screenshot implements Integration {
     /**
@@ -11,6 +11,8 @@ export declare class Screenshot implements Integration {
     name: string;
     /**
      * If enabled attaches a screenshot to the event hint.
+     *
+     * @deprecated Screenshots are now added in global event processor.
      */
     static attachScreenshotToEventHint(hint: EventHint, { attachScreenshot }: {
         attachScreenshot?: boolean;
@@ -18,6 +20,6 @@ export declare class Screenshot implements Integration {
     /**
      * @inheritDoc
      */
-    setupOnce(): void;
+    setupOnce(addGlobalEventProcessor: (e: EventProcessor) => void): void;
 }
 //# sourceMappingURL=screenshot.d.ts.map

package/ts3.8/dist/js/options.d.ts

@@ -33,7 +33,14 @@ export interface BaseReactNativeOptions {
     enableAutoSessionTracking?: boolean;
     /** The interval to end a session if the App goes to the background. */
     sessionTrackingIntervalMillis?: number;
-    /** Enable scope sync from Java to NDK on Android */
+    /** Enable NDK on Android
+     *
+     * @default true
+     */
+    enableNdk?: boolean;
+    /** Enable scope sync from Java to NDK on Android
+     * Only has an effect if `enableNdk` is `true`.
+     */
     enableNdkScopeSync?: boolean;
     /** When enabled, all the threads are automatically attached to all logged events on Android */
     attachThreads?: boolean;

package/ts3.8/dist/js/sdk.d.ts

@@ -10,7 +10,7 @@ export declare function init(passedOptions: ReactNativeOptions): void;
 /**
  * Inits the Sentry React Native SDK with automatic instrumentation and wrapped features.
  */
-export declare function wrap<P extends JSX.IntrinsicAttributes>(RootComponent: React.ComponentType<P>, options?: ReactNativeWrapperOptions): React.ComponentType<P>;
+export declare function wrap<P extends Record<string, unknown>>(RootComponent: React.ComponentType<P>, options?: ReactNativeWrapperOptions): React.ComponentType<P>;
 /**
  * Deprecated. Sets the release on the event.
  * NOTE: Does not set the release on sessions.

package/ts3.8/dist/js/tracing/reactnativetracing.d.ts

@@ -96,6 +96,8 @@ export declare class ReactNativeTracing implements Integration {
     private _awaitingAppStartData?;
     private _appStartFinishTimestamp?;
     private _currentRoute?;
+    private _hasSetTracePropagationTargets;
+    private _hasSetTracingOrigins;
     constructor(options?: Partial<ReactNativeTracingOptions>);
     /**
      *  Registers routing and request instrumentation.
@@ -121,6 +123,11 @@ export declare class ReactNativeTracing implements Integration {
         elementId: string | undefined;
         op: string;
     }): TransactionType | undefined;
+    /**
+     * Returns the App Start Duration in Milliseconds. Also returns undefined if not able do
+     * define the duration.
+     */
+    private _getAppStartDurationMilliseconds;
     /**
      * Instruments the app start measurements on the first route transaction.
      * Starts a route transaction if there isn't routing instrumentation.
@@ -138,5 +145,9 @@ export declare class ReactNativeTracing implements Integration {
     private _onConfirmRoute;
     /** Create routing idle transaction. */
     private _createRouteTransaction;
+    /**
+     * Start app state aware idle transaction on the scope.
+     */
+    private _startIdleTransaction;
 }
 //# sourceMappingURL=reactnativetracing.d.ts.map

package/ts3.8/dist/js/tracing/transaction.d.ts

@@ -1,7 +1,11 @@
-import type { BeforeFinishCallback } from '@sentry/core';
+import type { BeforeFinishCallback, IdleTransaction } from '@sentry/core';
 /**
  * Idle Transaction callback to only sample transactions with child spans.
  * To avoid side effects of other callbacks this should be hooked as the last callback.
  */
 export declare const onlySampleIfChildSpans: BeforeFinishCallback;
+/**
+ * Hooks on AppState change to cancel the transaction if the app goes background.
+ */
+export declare const cancelInBackground: (transaction: IdleTransaction) => void;
 //# sourceMappingURL=transaction.d.ts.map

package/ts3.8/dist/js/version.d.ts

@@ -1,4 +1,4 @@
 export declare const SDK_PACKAGE_NAME = "npm:@sentry/react-native";
 export declare const SDK_NAME = "sentry.javascript.react-native";
-export declare const SDK_VERSION = "5.9.2";
+export declare const SDK_VERSION = "5.11.0";
 //# sourceMappingURL=version.d.ts.map