Merge efea84f into ae2f6bc

packages/core/package.json

@@ -66,21 +66,20 @@
   },
   "dependencies": {
     "@sentry/babel-plugin-component-annotate": "3.1.2",
-    "@sentry/browser": "8.54.0",
+    "@sentry/browser": "9.1.0",
     "@sentry/cli": "2.41.1",
-    "@sentry/core": "8.54.0",
-    "@sentry/react": "8.54.0",
-    "@sentry/types": "8.54.0",
-    "@sentry/utils": "8.54.0"
+    "@sentry/core": "9.1.0",
+    "@sentry/react": "9.1.0",
+    "@sentry/types": "9.1.0"
   },
   "devDependencies": {
     "@babel/core": "^7.25.2",
     "@expo/metro-config": "0.19.5",
     "@mswjs/interceptors": "^0.25.15",
     "@react-native/babel-preset": "0.77.0",
-    "@sentry-internal/eslint-config-sdk": "8.54.0",
-    "@sentry-internal/eslint-plugin-sdk": "8.54.0",
-    "@sentry-internal/typescript": "8.54.0",
+    "@sentry-internal/eslint-config-sdk": "9.1.0",
+    "@sentry-internal/eslint-plugin-sdk": "9.1.0",
+    "@sentry-internal/typescript": "9.1.0",
     "@sentry/wizard": "3.40.0",
     "@testing-library/react-native": "^12.7.2",
     "@types/jest": "^29.5.13",
@@ -100,7 +99,7 @@
     "eslint-plugin-react-native": "^3.8.1",
     "expo": "^52.0.0",
     "expo-module-scripts": "3.1.0",
-    "jest": "^29.6.2",
+    "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.6.2",
     "jest-extended": "^4.0.2",
     "madge": "^6.1.0",
@@ -110,7 +109,7 @@
     "react-native": "0.77.0",
     "react-test-renderer": "^18.3.1",
     "rimraf": "^4.1.1",
-    "ts-jest": "^29.1.1",
+    "ts-jest": "^29.2.5",
     "typescript": "4.9.5",
     "uglify-js": "^3.17.4",
     "uuid": "^9.0.1",

packages/core/plugin/src/withSentry.ts

@@ -15,7 +15,7 @@ interface PluginProps {
 const withSentryPlugin: ConfigPlugin<PluginProps | void> = (config, props) => {
   const sentryProperties = getSentryProperties(props);
 
-  if (props && props.authToken) {
+  if (props?.authToken) {
     // If not removed, the plugin config with the authToken will be written to the application package
     delete props.authToken;
   }

packages/core/src/js/index.ts

@@ -1,6 +1,5 @@
 export type {
   Breadcrumb,
-  Request,
   SdkInfo,
   Event,
   Exception,
@@ -43,7 +42,6 @@ export {
   getClient,
   setCurrentClient,
   addEventProcessor,
-  metricsDefault as metrics,
   lastEventId,
 } from '@sentry/core';
 

packages/core/src/js/integrations/debugsymbolicator.ts

@@ -143,7 +143,7 @@ function replaceExceptionFramesInException(exception: Exception, frames: SentryS
  * @param frames StackFrame[]
  */
 function replaceThreadFramesInEvent(event: Event, frames: SentryStackFrame[]): void {
-  if (event.threads && event.threads.values && event.threads.values[0] && event.threads.values[0].stacktrace) {
+  if (event.threads?.values?.[0]?.stacktrace) {
     event.threads.values[0].stacktrace.frames = frames.reverse();
   }
 }

packages/core/src/js/integrations/default.ts

@@ -91,10 +91,7 @@ export function getDefaultIntegrations(options: ReactNativeClientOptions): Integ
   // hasTracingEnabled from `@sentry/core` only check if tracesSampler or tracesSampleRate keys are present
   // that's different from prev imp here and might lead misconfiguration
   // `tracesSampleRate: undefined` should not enable tracing
-  const hasTracingEnabled =
-    options.enableTracing ||
-    typeof options.tracesSampleRate === 'number' ||
-    typeof options.tracesSampler === 'function';
+  const hasTracingEnabled = typeof options.tracesSampleRate === 'number' || typeof options.tracesSampler === 'function';
   if (hasTracingEnabled && options.enableAppStartTracking) {
     integrations.push(appStartIntegration());
   }

packages/core/src/js/integrations/nativelinkederrors.ts

@@ -43,7 +43,7 @@ export const nativeLinkedErrorsIntegration = (options: Partial<LinkedErrorsOptio
 };
 
 function preprocessEvent(event: Event, hint: EventHint | undefined, client: Client, limit: number, key: string): void {
-  if (!event.exception || !event.exception.values || !hint || !isInstanceOf(hint.originalException, Error)) {
+  if (!event.exception?.values || !hint || !isInstanceOf(hint.originalException, Error)) {
     return;
   }
 
@@ -176,10 +176,10 @@ function exceptionFromAppleStackReturnAddresses(objCException: {
       type: objCException.name,
       value: objCException.message,
       stacktrace: {
-        frames: (nativeStackFrames && nativeStackFrames.frames.reverse()) || [],
+        frames: nativeStackFrames?.frames.reverse() || [],
       },
     },
-    appleDebugImages: (nativeStackFrames && (nativeStackFrames.debugMetaImages as DebugImage[])) || [],
+    appleDebugImages: (nativeStackFrames?.debugMetaImages as DebugImage[]) || [],
   };
 }
 

packages/core/src/js/integrations/reactnativeerrorhandlers.ts

@@ -99,7 +99,7 @@ function setupErrorUtilsGlobalHandler(): void {
     return;
   }
 
-  const defaultHandler = errorUtils.getGlobalHandler && errorUtils.getGlobalHandler();
+  const defaultHandler = errorUtils.getGlobalHandler?.();
 
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   errorUtils.setGlobalHandler(async (error: any, isFatal?: boolean) => {
@@ -155,7 +155,9 @@ function setupErrorUtilsGlobalHandler(): void {
       return;
     }
 
-    void client.flush(client.getOptions().shutdownTimeout || 2000).then(
+    // SEE: https://github.com/getsentry/sentry-javascript/pull/15217
+    // void client.flush(client.getOptions().shutdownTimeout || 2000).then(
+    void client.flush(2000).then(
       () => {
         defaultHandler(error, isFatal);
       },

packages/core/src/js/integrations/screenshot.ts

@@ -18,13 +18,13 @@ export const screenshotIntegration = (): Integration => {
 };
 
 async function processEvent(event: Event, hint: EventHint, client: ReactNativeClient): Promise<Event> {
-  const hasException = event.exception && event.exception.values && event.exception.values.length > 0;
+  const hasException = event.exception?.values?.length > 0;
   if (!hasException || client.getOptions().beforeScreenshot?.(event, hint) === false) {
     return event;
   }
 
   const screenshots: ScreenshotAttachment[] | null = await NATIVE.captureScreenshot();
-  if (screenshots && screenshots.length > 0) {
+  if (screenshots?.length > 0) {
     hint.attachments = [...screenshots, ...(hint?.attachments || [])];
   }
 

packages/core/src/js/integrations/spotlight.ts

@@ -103,7 +103,7 @@ function getHostnameFromString(urlString: string): string | null {
   const regex = /^(?:\w+:)?\/\/([^/:]+)(:\d+)?(.*)$/;
   const matches = urlString.match(regex);
 
-  if (matches && matches[1]) {
+  if (matches?.[1]) {
     return matches[1];
   } else {
     // Invalid URL format

packages/core/src/js/integrations/viewhierarchy.ts

@@ -21,7 +21,7 @@ export const viewHierarchyIntegration = (): Integration => {
 };
 
 async function processEvent(event: Event, hint: EventHint): Promise<Event> {
-  const hasException = event.exception && event.exception.values && event.exception.values.length > 0;
+  const hasException = event.exception?.values?.length > 0;
   if (!hasException) {
     return event;
   }

packages/core/src/js/profiling/convertHermesProfile.ts

@@ -163,7 +163,7 @@ function mapStacks(
     while (currentHermesFrameId !== undefined) {
       const sentryFrameId = hermesStackFrameIdToSentryFrameIdMap.get(currentHermesFrameId);
       sentryFrameId !== undefined && stack.push(sentryFrameId);
-      currentHermesFrameId = hermesStackFrames[currentHermesFrameId] && hermesStackFrames[currentHermesFrameId].parent;
+      currentHermesFrameId = hermesStackFrames[currentHermesFrameId]?.parent;
     }
     stacks.push(stack);
   }

packages/core/src/js/profiling/integration.ts

@@ -128,7 +128,7 @@ export const hermesProfilingIntegration = (initOptions: HermesProfilingOptions =
     }
 
     const client = getClient<ReactNativeClient>();
-    const options = client && client.getOptions();
+    const options = client?.getOptions?.();
 
     const profilesSampleRate =
       options && typeof options.profilesSampleRate === 'number' ? options.profilesSampleRate : undefined;

packages/core/src/js/profiling/utils.ts

@@ -75,12 +75,12 @@ export function enrichCombinedProfileWithEventContext(
     return null;
   }
 
-  const trace_id = (event.contexts && event.contexts.trace && event.contexts.trace.trace_id) || '';
+  const trace_id = event.contexts?.trace?.trace_id || '';
 
   // Log a warning if the profile has an invalid traceId (should be uuidv4).
   // All profiles and transactions are rejected if this is the case and we want to
   // warn users that this is happening if they enable debug flag
-  if (trace_id && trace_id.length !== 32) {
+  if (trace_id?.length !== 32) {
     if (__DEV__) {
       logger.log(`[Profiling] Invalid traceId: ${trace_id} on profiled event`);
     }
@@ -97,25 +97,25 @@ export function enrichCombinedProfileWithEventContext(
     release: event.release || '',
     environment: event.environment || getDefaultEnvironment(),
     os: {
-      name: (event.contexts && event.contexts.os && event.contexts.os.name) || '',
-      version: (event.contexts && event.contexts.os && event.contexts.os.version) || '',
-      build_number: (event.contexts && event.contexts.os && event.contexts.os.build) || '',
+      name: event.contexts?.os?.name || '',
+      version: event.contexts?.os?.version || '',
+      build_number: event.contexts?.os?.build || '',
     },
     device: {
-      locale: (event.contexts && event.contexts.device && (event.contexts.device.locale as string)) || '',
-      model: (event.contexts && event.contexts.device && event.contexts.device.model) || '',
-      manufacturer: (event.contexts && event.contexts.device && event.contexts.device.manufacturer) || '',
-      architecture: (event.contexts && event.contexts.device && event.contexts.device.arch) || '',
-      is_emulator: (event.contexts && event.contexts.device && event.contexts.device.simulator) || false,
+      locale: (event.contexts?.device && (event.contexts.device.locale as string)) || '',
+      model: event.contexts?.device?.model || '',
+      manufacturer: event.contexts?.device?.manufacturer || '',
+      architecture: event.contexts?.device?.arch || '',
+      is_emulator: event.contexts?.device?.simulator || false,
     },
     transaction: {
       name: event.transaction || '',
       id: event.event_id || '',
       trace_id,
-      active_thread_id: (profile.transaction && profile.transaction.active_thread_id) || '',
+      active_thread_id: profile.transaction?.active_thread_id || '',
     },
     debug_meta: {
-      images: [...getDebugMetadata(), ...((profile.debug_meta && profile.debug_meta.images) || [])],
+      images: [...getDebugMetadata(), ...(profile.debug_meta?.images || [])],
     },
   };
 }
@@ -136,19 +136,15 @@ export function enrichAndroidProfileWithEventContext(
     build_id: profile.build_id || '',
 
     device_cpu_frequencies: [],
-    device_is_emulator: (event.contexts && event.contexts.device && event.contexts.device.simulator) || false,
-    device_locale: (event.contexts && event.contexts.device && (event.contexts.device.locale as string)) || '',
-    device_manufacturer: (event.contexts && event.contexts.device && event.contexts.device.manufacturer) || '',
-    device_model: (event.contexts && event.contexts.device && event.contexts.device.model) || '',
-    device_os_name: (event.contexts && event.contexts.os && event.contexts.os.name) || '',
-    device_os_version: (event.contexts && event.contexts.os && event.contexts.os.version) || '',
+    device_is_emulator: event.contexts?.device?.simulator || false,
+    device_locale: (event.contexts?.device && (event.contexts.device.locale as string)) || '',
+    device_manufacturer: event.contexts?.device?.manufacturer || '',
+    device_model: event.contexts?.device?.model || '',
+    device_os_name: event.contexts?.os?.name || '',
+    device_os_version: event.contexts?.os?.version || '',
 
     device_physical_memory_bytes:
-      (event.contexts &&
-        event.contexts.device &&
-        event.contexts.device.memory_size &&
-        Number(event.contexts.device.memory_size).toString(10)) ||
-      '',
+      (event.contexts?.device?.memory_size && Number(event.contexts.device.memory_size).toString(10)) || '',
 
     environment: event.environment || getDefaultEnvironment(),
 
@@ -161,7 +157,7 @@ export function enrichAndroidProfileWithEventContext(
 
     transaction_id: event.event_id || '',
     transaction_name: event.transaction || '',
-    trace_id: (event.contexts && event.contexts.trace && event.contexts.trace.trace_id) || '',
+    trace_id: event.contexts?.trace?.trace_id || '',
 
     version_name: event.release || '',
     version_code: event.dist || '',

packages/core/src/js/replay/CustomMask.tsx

@@ -32,7 +32,7 @@ const UnmaskFallback = (viewProps: ViewProps): React.ReactElement => {
   return <View {...viewProps} />;
 };
 
-const hasViewManagerConfig = (nativeComponentName: string): boolean => UIManager.hasViewManagerConfig && UIManager.hasViewManagerConfig(nativeComponentName);
+const hasViewManagerConfig = (nativeComponentName: string): boolean => UIManager.hasViewManagerConfig?.(nativeComponentName);
 
 const Mask = ((): HostComponent<ViewProps> | React.ComponentType<ViewProps> => {
   if (!hasViewManagerConfig(MaskNativeComponentName)) {

packages/core/src/js/replay/mobilereplay.ts

@@ -76,7 +76,7 @@ export const mobileReplayIntegration = (initOptions: MobileReplayOptions = defau
   const options = { ...defaultOptions, ...initOptions };
 
   async function processEvent(event: Event): Promise<Event> {
-    const hasException = event.exception && event.exception.values && event.exception.values.length > 0;
+    const hasException = event.exception?.values?.length > 0;
     if (!hasException) {
       // Event is not an error, will not capture replay
       return event;

packages/core/src/js/sdk.tsx

@@ -157,6 +157,7 @@ export function wrap<P extends Record<string, unknown>>(
   const profilerProps = {
     ...(options?.profilerProps ?? {}),
     name: RootComponent.displayName ?? 'Root',
+    updateProps: {}
   };
 
   const RootApp: React.FC<P> = (appProps) => {

packages/core/src/js/tools/metroconfig.ts

@@ -140,7 +140,7 @@ export function withSentryBabelTransformer(
   config: MetroConfig,
   annotateReactComponents: true | { ignoredComponents?: string[] },
 ): MetroConfig {
-  const defaultBabelTransformerPath = config.transformer && config.transformer.babelTransformerPath;
+  const defaultBabelTransformerPath = config.transformer?.babelTransformerPath;
   logger.debug('Default Babel transformer path from `config.transformer`:', defaultBabelTransformerPath);
 
   if (!defaultBabelTransformerPath) {
@@ -270,10 +270,10 @@ export function withSentryFramesCollapsed(config: MetroConfig): MetroConfig {
       originalCustomization: MetroCustomizeFrame | undefined,
     ): MetroCustomizeFrame => ({
       ...originalCustomization,
-      collapse: (originalCustomization && originalCustomization.collapse) || collapseSentryInternalFrames(frame),
+      collapse: originalCustomization?.collapse || collapseSentryInternalFrames(frame),
     });
 
-    const maybePromiseCustomization = (originalCustomizeFrame && originalCustomizeFrame(frame)) || undefined;
+    const maybePromiseCustomization = originalCustomizeFrame?.(frame) || undefined;
 
     if (maybePromiseCustomization !== undefined && 'then' in maybePromiseCustomization) {
       return maybePromiseCustomization.then<MetroCustomizeFrame>(originalCustomization =>

packages/core/src/js/tracing/integrations/appStart.ts

@@ -212,7 +212,7 @@ export const appStartIntegration = ({
       return;
     }
 
-    if (!event.contexts || !event.contexts.trace) {
+    if (!event.contexts?.trace) {
       logger.warn('[AppStart] Transaction event is missing trace context. Can not attach app start.');
       return;
     }

packages/core/src/js/tracing/onSpanEndUtils.ts

@@ -129,7 +129,7 @@ export const cancelInBackground = (client: Client, span: Span): void => {
     client.on('spanEnd', (endedSpan: Span) => {
       if (endedSpan === span) {
         logger.debug(`Removing AppState listener for ${spanToJSON(span).op} transaction.`);
-        subscription && subscription.remove && subscription.remove();
+        subscription?.remove?.();
       }
     });
 };

packages/core/src/js/tracing/reactnativenavigation.ts

@@ -129,7 +129,7 @@ export const reactNativeNavigationIntegration = ({
     }
 
     latestNavigationSpan = startGenericIdleNavigationSpan(
-      tracing && tracing.options.beforeStartSpan
+      tracing?.options.beforeStartSpan
         ? tracing.options.beforeStartSpan(getDefaultIdleNavigationSpanOptions())
         : getDefaultIdleNavigationSpanOptions(),
       idleSpanOptions,

packages/core/src/js/tracing/reactnativeprofiler.tsx

@@ -43,7 +43,7 @@ export class ReactNativeProfiler extends Profiler {
       return;
     }
 
-    client.addIntegration && client.addIntegration(createIntegration(this.name));
+    client.addIntegration?.(createIntegration(this.name));
     // eslint-disable-next-line @typescript-eslint/no-floating-promises
     _captureAppStart({ isManual: false });
   }

packages/core/src/js/tracing/reactnavigation.ts

@@ -190,7 +190,7 @@ export const reactNavigationIntegration = ({
     }
 
     latestNavigationSpan = startGenericIdleNavigationSpan(
-      tracing && tracing.options.beforeStartSpan
+      tracing?.options.beforeStartSpan
         ? tracing.options.beforeStartSpan(getDefaultIdleNavigationSpanOptions())
         : getDefaultIdleNavigationSpanOptions(),
       idleSpanOptions,

packages/core/src/js/tracing/span.ts

@@ -1,6 +1,7 @@
 import type { Client, Scope, Span, StartSpanOptions } from '@sentry/core';
 import {
-  generatePropagationContext,
+  // generatePropagationContext replaced by generateTraceId,
+  generateTraceId,
   getActiveSpan,
   getClient,
   getCurrentScope,
@@ -104,7 +105,7 @@ export const startIdleSpan = (
     return new SentryNonRecordingSpan();
   }
 
-  getCurrentScope().setPropagationContext(generatePropagationContext());
+  getCurrentScope().setPropagationContext({ traceId: generateTraceId(), sampleRand: Math.random() });
 
   const span = coreStartIdleSpan(startSpanOption, { finalTimeout, idleTimeout });
   cancelInBackground(client, span);

packages/core/src/js/transports/encodePolyfill.ts

@@ -2,11 +2,13 @@ import { RN_GLOBAL_OBJ } from '../utils/worldwide';
 import { utf8ToBytes } from '../vendor';
 
 export const useEncodePolyfill = (): void => {
+  // TODO: Still required?
   if (!RN_GLOBAL_OBJ.__SENTRY__) {
     (RN_GLOBAL_OBJ.__SENTRY__ as Partial<(typeof RN_GLOBAL_OBJ)['__SENTRY__']>) = {};
   }
 
-  RN_GLOBAL_OBJ.__SENTRY__.encodePolyfill = encodePolyfill;
+  // TODO: Should point to SDK dependency or latest dependency?
+  RN_GLOBAL_OBJ.__SENTRY__['9.1.0'].encodePolyfill = encodePolyfill;
 };
 
 export const encodePolyfill = (text: string): Uint8Array => {