Merge 709697c into 077a1bd

Author: lucas-zimerman

CHANGELOG.md

@@ -8,6 +8,12 @@
 
 ## Unreleased
 
+### Upgrading from 6.x to 7.0
+
+Version 7 of the Sentry React Native SDK primarily introduces API cleanup and version support changes. This update contains behavioral changes that will not be caught by type checkers, linters, or tests, so we recommend carefully reading through the entire migration guide instead of relying on automatic tooling.
+
+Version 7 of the SDK is compatible with Sentry self-hosted versions 24.4.2 or higher (unchanged from v6). Lower versions may continue to work, but may not support all features.
+
 ### Dependencies
 
 - Bump Bundler Plugins from v3.2.2 to v3.2.4 ([#4693](https://github.com/getsentry/sentry-react-native/pull/4693), [#4707](https://github.com/getsentry/sentry-react-native/pull/4707))
@@ -186,6 +192,9 @@ Change `Cold/Warm App Start` span description to `Cold/Warm Start` ([#4636](http
 
 ### Dependencies
 
+- Bump JavaScript SDK from v8.54.0 to v9.1.0 ([#4568](https://github.com/getsentry/sentry-react-native/pull/4568))
+  - [changelog](https://github.com/getsentry/sentry-javascript/blob/9.1.0/CHANGELOG.md)
+  - [diff](https://github.com/getsentry/sentry-javascript/compare/8.54.0...9.1.0)
 - Bump Android SDK from v7.20.1 to v8.3.0 ([#4490](https://github.com/getsentry/sentry-react-native/pull/4490))
   - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#830)
   - [diff](https://github.com/getsentry/sentry-java/compare/7.20.1...8.3.0)
@@ -199,6 +208,39 @@ Change `Cold/Warm App Start` span description to `Cold/Warm Start` ([#4636](http
   - [changelog](https://github.com/getsentry/sentry-javascript-bundler-plugins/blob/main/CHANGELOG.md#320)
   - [diff](https://github.com/getsentry/sentry-javascript-bundler-plugins/compare/3.1.2...3.2.0)
 
+
+### Major Changes
+
+- `ip addresses` is only collected when `sendDefaultPii`: `true`
+- Exceptions from `captureConsoleIntegration` are now marked as handled: true by default
+- `shutdownTimeout` moved from `core` to `@sentry/react-native`
+- `hasTracingEnabled` was renamed to `hasSpansEnabled`
+- You can no longer drop spans or return null on `beforeSendSpan` hook
+
+### Removed types
+
+- TransactionNamingScheme
+- Request
+- Scope (prefer using the Scope class)
+
+### Other removed items.
+
+- `autoSessionTracking` from options.
+  To enable session tracking, ensure that `enableAutoSessionTracking` is enabled.
+
+- `enableTracing`. Instead, set `tracesSampleRate` to a value greater than `zero` to `enable tracing`, `0` to keep tracing integrations active without sampling, or `undefined` to disable the performance integration.
+
+- `getCurrentHub()`, `Hub`, and `getCurrentHubShim()`
+- `spanId` from propagation `context`
+- metrics API
+- `transactionContext` from `samplingContext`
+- `@sentry/utils` package, the exports were moved to `@sentry/core`
+- Standalone `Client` interface & deprecate `BaseClient`
+
+## Other Changes
+
+- Fork `scope` if custom scope is passed to `startSpanManual` or `startSpan`
+
 ## 6.7.0
 
 > [!WARNING]

dev-packages/e2e-tests/package.json

@@ -13,7 +13,7 @@
   "devDependencies": {
     "@babel/preset-env": "^7.25.3",
     "@babel/preset-typescript": "^7.18.6",
-    "@sentry/core": "8.54.0",
+    "@sentry/core": "9.1.0",
     "@sentry/react-native": "6.11.0-beta.0",
     "@types/node": "^20.9.3",
     "@types/react": "^18.2.64",

dev-packages/type-check/ts3.8-test/index.ts

@@ -3,6 +3,8 @@ declare global {
   interface IDBObjectStore {}
   interface Window {
     fetch: any;
+    setTimeout: any;
+    document: any;
   }
   interface ShadowRoot {}
   interface BufferSource {}
@@ -19,6 +21,7 @@ declare global {
     redirectCount: number;
   }
   interface PerformanceEntry {}
+  interface Performance {}
 }
 
 declare module 'react-native' {

packages/core/package.json

@@ -65,22 +65,21 @@
     "react-native": ">=0.65.0"
   },
   "dependencies": {
-    "@sentry/babel-plugin-component-annotate": "3.2.4",
-    "@sentry/browser": "8.54.0",
+    "@sentry/babel-plugin-component-annotate": "3.1.2",
+    "@sentry/browser": "9.1.0",
     "@sentry/cli": "2.43.0",
-    "@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.1",
-    "@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": "4.6.0",
     "@testing-library/react-native": "^12.7.2",
     "@types/jest": "^29.5.13",
@@ -110,7 +109,7 @@
     "react-native": "0.77.1",
     "react-test-renderer": "^18.3.1",
     "rimraf": "^4.1.1",
-    "ts-jest": "^29.1.1",
+    "ts-jest": "^29.3.1",
     "typescript": "4.9.5",
     "uglify-js": "^3.17.4",
     "uuid": "^9.0.1",

packages/core/plugin/src/withSentry.ts

@@ -18,7 +18,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/plugin/src/withSentryAndroidGradlePlugin.ts

@@ -35,7 +35,7 @@ export function withSentryAndroidGradlePlugin(
   const withSentryProjectBuildGradle = (config: any): any => {
     return withProjectBuildGradle(config, (projectBuildGradle: any) => {
       // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-      if (!projectBuildGradle.modResults || !projectBuildGradle.modResults.contents) {
+      if (!projectBuildGradle.modResults?.contents) {
         warnOnce('android/build.gradle content is missing or undefined.');
         return config;
       }

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

@@ -93,10 +93,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[]) || [],
   };
 }