Merge 1528fb5 into 834729f

Author: krystofwoldrich

CHANGELOG.md

@@ -2,19 +2,63 @@
 
 <!-- prettier-ignore-start -->
 > [!IMPORTANT]
-> If you are upgrading to the `6.x` versions of the Sentry React Native SDK from `5.x` or below,
+> If you are upgrading to the `7.x` versions of the Sentry React Native SDK from `6.x` or below,
 > make sure you follow our [migration guide](https://docs.sentry.io/platforms/react-native/migration/) first.
 <!-- prettier-ignore-end -->
 
 ## Unreleased
 
+### Upgrading from 6.x to 7.0
+
+Version 7 of the Sentry React Native SDK primarily introduces API cleanup and version support changes based on the Sentry Javascript SDK version 9. 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.
+
 ### Fixes
 
 - Expo Updates Context is passed to native after native init to be available for crashes ([#4808](https://github.com/getsentry/sentry-react-native/pull/4808))
 - Expo Updates Context values should all be lowercase ([#4809](https://github.com/getsentry/sentry-react-native/pull/4809))
 
+### Major Changes
+
+- Set `{{auto}}` if `user.ip_address` is `undefined` and `sendDefaultPii: true` ([#4466](https://github.com/getsentry/sentry-react-native/pull/4466))
+- 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`
+- On React Native Web, `browserSessionIntegration` is added when `enableAutoSessionTracking` is set to `True` ([#4732](https://github.com/getsentry/sentry-react-native/pull/4732))
+Change `Cold/Warm App Start` span description to `Cold/Warm Start` ([#4636](https://github.com/getsentry/sentry-react-native/pull/4636))
+
 ### Dependencies
 
+- Bump JavaScript SDK from v8.54.0 to v9.12.0 ([#4568](https://github.com/getsentry/sentry-react-native/pull/4568), [#4752](https://github.com/getsentry/sentry-react-native/pull/4752))
+  - [changelog](https://github.com/getsentry/sentry-javascript/blob/9.12.0/CHANGELOG.md)
+  - [diff](https://github.com/getsentry/sentry-javascript/compare/8.54.0...9.12.0)
+- Bump Android SDK from v7.20.1 to v8.11.1 ([#4490](https://github.com/getsentry/sentry-react-native/pull/4490))
+  - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#8111)
+  - [diff](https://github.com/getsentry/sentry-java/compare/7.20.1...8.11.1)
 - Bump CLI from v2.43.1 to v2.45.0 ([#4804](https://github.com/getsentry/sentry-react-native/pull/4804), [#4818](https://github.com/getsentry/sentry-react-native/pull/4818))
   - [changelog](https://github.com/getsentry/sentry-cli/blob/master/CHANGELOG.md#2450)
   - [diff](https://github.com/getsentry/sentry-cli/compare/2.43.1...2.45.0)

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.12.0",
     "@sentry/react-native": "6.13.1",
     "@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,8 @@ declare global {
     redirectCount: number;
   }
   interface PerformanceEntry {}
+  interface Performance {}
+  interface PerformanceNavigationTiming {}
 }
 
 declare module 'react-native' {

packages/core/android/build.gradle

@@ -54,5 +54,5 @@ android {
 
 dependencies {
     implementation 'com.facebook.react:react-native:+'
-    api 'io.sentry:sentry-android:7.22.5'
+    api 'io.sentry:sentry-android:8.11.1'
 }

packages/core/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java

@@ -30,12 +30,12 @@
 import com.facebook.react.bridge.WritableNativeMap;
 import com.facebook.react.common.JavascriptException;
 import io.sentry.Breadcrumb;
-import io.sentry.HubAdapter;
 import io.sentry.ILogger;
 import io.sentry.IScope;
 import io.sentry.ISentryExecutorService;
 import io.sentry.ISerializer;
 import io.sentry.Integration;
+import io.sentry.ScopesAdapter;
 import io.sentry.Sentry;
 import io.sentry.SentryDate;
 import io.sentry.SentryDateProvider;
@@ -87,6 +87,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
+import java.util.Set;
 import java.util.concurrent.CountDownLatch;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -527,7 +528,7 @@ public void fetchNativeFrames(Promise promise) {
   }
 
   public void captureReplay(boolean isHardCrash, Promise promise) {
-    Sentry.getCurrentHub().getOptions().getReplayController().captureReplay(isHardCrash);
+    Sentry.getCurrentScopes().getOptions().getReplayController().captureReplay(isHardCrash);
     promise.resolve(getCurrentReplayId());
   }
 
@@ -623,7 +624,7 @@ public void fetchViewHierarchy(Promise promise) {
       return;
     }
 
-    ISerializer serializer = HubAdapter.getInstance().getOptions().getSerializer();
+    ISerializer serializer = ScopesAdapter.getInstance().getOptions().getSerializer();
     final @Nullable byte[] bytes =
         JsonSerializationUtils.bytesFrom(serializer, logger, viewHierarchy);
     if (bytes == null) {
@@ -677,10 +678,6 @@ public void setUser(final ReadableMap userKeys, final ReadableMap userDataKeys)
               if (userKeys.hasKey("ip_address")) {
                 userInstance.setIpAddress(userKeys.getString("ip_address"));
               }
-
-              if (userKeys.hasKey("segment")) {
-                userInstance.setSegment(userKeys.getString("segment"));
-              }
             }
 
             if (userDataKeys != null) {
@@ -842,8 +839,7 @@ private void initializeAndroidProfiler() {
             (int) SECONDS.toMicros(1) / profilingTracesHz,
             new SentryFrameMetricsCollector(reactApplicationContext, logger, buildInfo),
             executorService,
-            logger,
-            buildInfo);
+            logger);
   }
 
   public WritableMap startProfiling(boolean platformProfilers) {
@@ -867,7 +863,7 @@ public WritableMap startProfiling(boolean platformProfilers) {
   }
 
   public WritableMap stopProfiling() {
-    final boolean isDebug = HubAdapter.getInstance().getOptions().isDebug();
+    final boolean isDebug = ScopesAdapter.getInstance().getOptions().isDebug();
     final WritableMap result = new WritableNativeMap();
     File output = null;
     try {
@@ -953,7 +949,7 @@ private String readStringFromFile(File path) throws IOException {
   }
 
   public void fetchNativeDeviceContexts(Promise promise) {
-    final @NotNull SentryOptions options = HubAdapter.getInstance().getOptions();
+    final @NotNull SentryOptions options = ScopesAdapter.getInstance().getOptions();
     final @Nullable Context context = this.getReactApplicationContext().getApplicationContext();
     final @Nullable IScope currentScope = InternalSentrySdk.getCurrentScope();
     fetchNativeDeviceContexts(promise, options, context, currentScope);
@@ -990,7 +986,8 @@ protected void fetchNativeDeviceContexts(
   }
 
   public void fetchNativeSdkInfo(Promise promise) {
-    final @Nullable SdkVersion sdkVersion = HubAdapter.getInstance().getOptions().getSdkVersion();
+    final @Nullable SdkVersion sdkVersion =
+        ScopesAdapter.getInstance().getOptions().getSdkVersion();
     if (sdkVersion == null) {
       promise.resolve(null);
     } else {
@@ -1069,14 +1066,14 @@ private void addPackages(SentryEvent event, SdkVersion sdk) {
     if (eventSdk != null
         && "sentry.javascript.react-native".equals(eventSdk.getName())
         && sdk != null) {
-      List<SentryPackage> sentryPackages = sdk.getPackages();
+      Set<SentryPackage> sentryPackages = sdk.getPackageSet();
       if (sentryPackages != null) {
         for (SentryPackage sentryPackage : sentryPackages) {
           eventSdk.addPackage(sentryPackage.getName(), sentryPackage.getVersion());
         }
       }
 
-      List<String> integrations = sdk.getIntegrations();
+      Set<String> integrations = sdk.getIntegrationSet();
       if (integrations != null) {
         for (String integration : integrations) {
           eventSdk.addIntegration(integration);

packages/core/package.json

@@ -66,21 +66,20 @@
   },
   "dependencies": {
     "@sentry/babel-plugin-component-annotate": "3.4.0",
-    "@sentry/browser": "8.54.0",
-    "@sentry/cli": "2.45.0",
-    "@sentry/core": "8.54.0",
-    "@sentry/react": "8.54.0",
-    "@sentry/types": "8.54.0",
-    "@sentry/utils": "8.54.0"
+    "@sentry/browser": "9.12.0",
+    "@sentry/cli": "2.43.0",
+    "@sentry/core": "9.12.0",
+    "@sentry/react": "9.12.0",
+    "@sentry/types": "9.12.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.12.0",
+    "@sentry-internal/eslint-plugin-sdk": "9.12.0",
+    "@sentry-internal/typescript": "9.12.0",
     "@sentry/wizard": "4.9.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/client.ts

@@ -10,7 +10,14 @@ import type {
   TransportMakeRequestResponse,
   UserFeedback,
 } from '@sentry/core';
-import { BaseClient, dateTimestampInSeconds, logger, SentryError } from '@sentry/core';
+import {
+  addAutoIpAddressToSession,
+  addAutoIpAddressToUser,
+  BaseClient,
+  dateTimestampInSeconds,
+  logger,
+  SentryError,
+} from '@sentry/core';
 import { Alert } from 'react-native';
 
 import { getDevServer } from './integrations/debugsymbolicatorutils';
@@ -48,6 +55,11 @@ export class ReactNativeClient extends BaseClient<ReactNativeClientOptions> {
     super(options);
 
     this._outcomesBuffer = [];
+
+    if (options.sendDefaultPii === true) {
+      this.on('postprocessEvent', addAutoIpAddressToUser);
+      this.on('beforeSendSession', addAutoIpAddressToSession);
+    }
   }
 
   /**

packages/core/src/js/feedback/FeedbackWidget.tsx

@@ -26,9 +26,7 @@ import { base64ToUint8Array, feedbackAlertDialog, isValidEmail  } from './utils'
  * Implements a feedback form screen that sends feedback to Sentry using Sentry.captureFeedback.
  */
 export class FeedbackWidget extends React.Component<FeedbackWidgetProps, FeedbackWidgetState> {
-  public static defaultProps: Partial<FeedbackWidgetProps> = {
-    ...defaultConfiguration
-  }
+  public static defaultProps = defaultConfiguration;
 
   private static _savedState: Omit<FeedbackWidgetState, 'isVisible'> = {
     name: '',
@@ -67,7 +65,7 @@ export class FeedbackWidget extends React.Component<FeedbackWidgetProps, Feedbac
   public handleFeedbackSubmit: () => void = () => {
     const { name, email, description } = this.state;
     const { onSubmitSuccess, onSubmitError, onFormSubmitted } = this.props;
-    const text: FeedbackTextConfiguration = this.props;
+    const text = this.props;
 
     const trimmedName = name?.trim();
     const trimmedEmail = email?.trim();
@@ -119,14 +117,14 @@ export class FeedbackWidget extends React.Component<FeedbackWidgetProps, Feedbac
 
   public onScreenshotButtonPress: () => void = async () => {
     if (!this.state.filename && !this.state.attachment) {
-      const imagePickerConfiguration: ImagePickerConfiguration = this.props;
-      if (imagePickerConfiguration.imagePicker) {
-        const launchImageLibrary = imagePickerConfiguration.imagePicker.launchImageLibraryAsync
+      const { imagePicker } = this.props;
+      if (imagePicker) {
+        const launchImageLibrary = imagePicker.launchImageLibraryAsync
           // expo-image-picker library is available
-          ? () => imagePickerConfiguration.imagePicker.launchImageLibraryAsync({ mediaTypes: ['images'], base64: isWeb() })
+          ? () => imagePicker.launchImageLibraryAsync?.({ mediaTypes: ['images'], base64: isWeb() })
           // react-native-image-picker library is available
-          : imagePickerConfiguration.imagePicker.launchImageLibrary
-            ? () => imagePickerConfiguration.imagePicker.launchImageLibrary({ mediaType: 'photo', includeBase64: isWeb() })
+          : imagePicker.launchImageLibrary
+            ? () => imagePicker.launchImageLibrary?.({ mediaType: 'photo', includeBase64: isWeb() })
             : null;
         if (!launchImageLibrary) {
           logger.warn('No compatible image picker library found. Please provide a valid image picker library.');
@@ -140,22 +138,22 @@ export class FeedbackWidget extends React.Component<FeedbackWidgetProps, Feedbac
         }
 
         const result = await launchImageLibrary();
-        if (result.assets && result.assets.length > 0) {
+        if (result?.assets && result.assets.length > 0) {
           if (isWeb()) {
-            const filename = result.assets[0].fileName;
-            const imageUri = result.assets[0].uri;
-            const base64 = result.assets[0].base64;
-            const data = base64ToUint8Array(base64);
-            if (data != null) {
+            const filename = result.assets[0]?.fileName;
+            const imageUri = result.assets[0]?.uri;
+            const base64 = result.assets[0]?.base64;
+            const data = base64 ? base64ToUint8Array(base64) : undefined;
+            if (data) {
               this.setState({ filename, attachment: data, attachmentUri: imageUri });
             } else {
               logger.error('Failed to read image data on the web');
             }
           } else {
-            const filename = result.assets[0].fileName;
-            const imageUri = result.assets[0].uri;
-            getDataFromUri(imageUri).then((data) => {
-              if (data != null) {
+            const filename = result.assets[0]?.fileName;
+            const imageUri = result.assets[0]?.uri;
+            imageUri && getDataFromUri(imageUri).then((data) => {
+              if (data) {
                 this.setState({ filename, attachment: data, attachmentUri: imageUri });
               } else {
                 logger.error('Failed to read image data from uri:', imageUri);