@sentry/react-native 5.0.0-alpha.4 → 5.0.0-alpha.6

package/CHANGELOG.md

@@ -1,5 +1,102 @@
 # Changelog
 
+# Unreleased
+
+- Latest changes from 4.6.1
+
+### Features
+- Add initial support for the RN New Architecture, backwards compatible RNSentry Turbo Module ([#2522](https://github.com/getsentry/sentry-react-native/pull/2522))
+
+### Breaking changes
+
+- New ReactNativeTracingOptions idleTimeoutMs and finalTimeoutMs replacing idleTimeout and maxTransactionDuration respectively ([#2481](https://github.com/getsentry/sentry-react-native/pull/2481))
+- iOS min target 12.4, Android API min 21, min React Native version 0.70 ([#2522](https://github.com/getsentry/sentry-react-native/pull/2522))
+
+### Dependencies
+
+- Bump Android SDK from v6.4.3 to v6.5.0 ([#2535](https://github.com/getsentry/sentry-react-native/pull/2535))
+  - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#650)
+  - [diff](https://github.com/getsentry/sentry-java/compare/6.4.3...6.5.0)
+- Bump JavaScript SDK from v7.14.2 to v7.15.0 ([#2536](https://github.com/getsentry/sentry-react-native/pull/2536))
+  - [changelog](https://github.com/getsentry/sentry-javascript/blob/master/CHANGELOG.md#7150)
+  - [diff](https://github.com/getsentry/sentry-javascript/compare/7.14.2...7.15.0)
+
+## 5.0.0-alpha.6
+
+### Various fixes & improvements
+
+- build(deps-dev): bump eslint-plugin-react from 7.20.6 to 7.31.10 (#2537) by @dependabot
+- build(deps): bump async from 2.6.3 to 2.6.4 in /sample (#2491) by @dependabot
+- build(deps): bump github/codeql-action from 2.1.26 to 2.1.27 (#2529) by @dependabot
+- chore(deps): update JavaScript SDK to v7.15.0 (#2536) by @github-actions
+- chore(deps): update Android SDK to v6.5.0 (#2535) by @github-actions
+- release: 4.6.1 (3c8631d1) by @getsentry-bot
+- chore(deps): update JavaScript SDK to v7.14.2 (#2526) by @github-actions
+- Allows collecting app start and slow/frozen frames if Native SDK is inited manually (#2517) by @marandaneto
+- Nested breadcrumb data on android was not treated correctly (#2519) by @marandaneto
+
+## 4.6.1
+
+### Fixes
+
+- Make `configureScope` callback safe [#2510](https://github.com/getsentry/sentry-react-native/pull/2510)
+- Allows collecting app start and slow/frozen frames if Native SDK is inited manually [#2517](https://github.com/getsentry/sentry-react-native/pull/2517)
+- Nested breadcrumb data on android was not treated correctly [#2519](https://github.com/getsentry/sentry-react-native/pull/2519)
+
+### Dependencies
+
+- Bump JavaScript SDK from v7.14.0 to v7.14.2 ([#2511](https://github.com/getsentry/sentry-react-native/pull/2511), [#2526](https://github.com/getsentry/sentry-react-native/pull/2526))
+  - [changelog](https://github.com/getsentry/sentry-javascript/blob/master/CHANGELOG.md#7142)
+  - [diff](https://github.com/getsentry/sentry-javascript/compare/7.14.0...7.14.2)
+- Bump Cocoa SDK from v7.27.0 to v7.27.1 ([#2521](https://github.com/getsentry/sentry-react-native/pull/2521))
+  - [changelog](https://github.com/getsentry/sentry-cocoa/blob/master/CHANGELOG.md#7271)
+  - [diff](https://github.com/getsentry/sentry-cocoa/compare/7.27.0...7.27.1)
+- Bump Android SDK from v6.4.2 to v6.4.3 ([#2520](https://github.com/getsentry/sentry-react-native/pull/2520))
+  - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#643)
+  - [diff](https://github.com/getsentry/sentry-java/compare/6.4.2...6.4.3)
+
+## 5.0.0-alpha.5
+
+### Fixes
+
+- Make `configureScope` callback safe [#2510](https://github.com/getsentry/sentry-react-native/pull/2510)
+
+### Dependencies
+
+- Bump JavaScript SDK from v7.14.0 to v7.14.1 ([#2511](https://github.com/getsentry/sentry-react-native/pull/2511))
+  - [changelog](https://github.com/getsentry/sentry-javascript/blob/master/CHANGELOG.md#7141)
+  - [diff](https://github.com/getsentry/sentry-javascript/compare/7.14.0...7.14.1)
+- Bump Cocoa SDK from v7.27.0 to v7.27.1 ([#2521](https://github.com/getsentry/sentry-react-native/pull/2521))
+  - [changelog](https://github.com/getsentry/sentry-cocoa/blob/master/CHANGELOG.md#7271)
+  - [diff](https://github.com/getsentry/sentry-cocoa/compare/7.27.0...7.27.1)
+- Bump Android SDK from v6.4.2 to v6.4.3 ([#2520](https://github.com/getsentry/sentry-react-native/pull/2520))
+  - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#643)
+  - [diff](https://github.com/getsentry/sentry-java/compare/6.4.2...6.4.3)
+
+## 4.6.0
+
+### Fixes
+
+- SDK Gracefully downgrades when callback throws an error ([#2502](https://github.com/getsentry/sentry-react-native/pull/2502))
+- React Navigation v5 ignores when current route is undefined after state changed. ([#2484](https://github.com/getsentry/sentry-react-native/pull/2484))
+
+### Features
+
+- Add ClientReports ([#2496](https://github.com/getsentry/sentry-react-native/pull/2496))
+
+### Sentry Self-hosted Compatibility
+
+- Starting with version `4.6.0` of the `@sentry/react-native` package, [Sentry's self hosted version >= v21.9.0](https://github.com/getsentry/self-hosted/releases) is required or you have to manually disable sending client reports via the `sendClientReports` option. This only applies to self-hosted Sentry. If you are using [sentry.io](https://sentry.io), no action is needed.
+
+### Dependencies
+
+- Bump Cocoa SDK from v7.25.1 to v7.27.0 ([#2500](https://github.com/getsentry/sentry-react-native/pull/2500), [#2506](https://github.com/getsentry/sentry-react-native/pull/2506))
+  - [changelog](https://github.com/getsentry/sentry-cocoa/blob/master/CHANGELOG.md#7270)
+  - [diff](https://github.com/getsentry/sentry-cocoa/compare/7.25.1...7.27.0)
+- Bump JavaScript SDK from v7.13.0 to v7.14.0 ([#2504](https://github.com/getsentry/sentry-react-native/pull/2504))
+  - [changelog](https://github.com/getsentry/sentry-javascript/blob/master/CHANGELOG.md#7140)
+  - [diff](https://github.com/getsentry/sentry-javascript/compare/7.13.0...7.14.0)
+
 ## 5.0.0-alpha.4
 
 - Latest changes from 4.5.0

package/RNSentry.podspec

@@ -1,6 +1,9 @@
 require 'json'
 version = JSON.parse(File.read('package.json'))["version"]
 
+folly_version = '2021.07.22.00'
+folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
+
 Pod::Spec.new do |s|
   s.name           = 'RNSentry'
   s.version        = version
@@ -10,15 +13,30 @@ Pod::Spec.new do |s|
   s.homepage       = "https://github.com/getsentry/sentry-react-native"
   s.source         = { :git => 'https://github.com/getsentry/sentry-react-native.git', :tag => "#{s.version}"}
 
-  s.ios.deployment_target = "8.0"
+  s.ios.deployment_target = "12.4"
   s.osx.deployment_target = "10.10"
-  s.tvos.deployment_target = "9.0"
+  s.tvos.deployment_target = "12.4"
 
   s.preserve_paths = '*.js'
 
   s.dependency 'React-Core'
-  s.dependency 'Sentry', '7.25.1'
+  s.dependency 'Sentry', '7.27.1'
 
-  s.source_files = 'ios/RNSentry.{h,m}'
+  s.source_files = 'ios/RNSentry.{h,mm}'
   s.public_header_files = 'ios/RNSentry.h'
+
+  # This guard prevent to install the dependencies when we run `pod install` in the old architecture.
+  if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then
+    s.compiler_flags = folly_compiler_flags + " -DRCT_NEW_ARCH_ENABLED=1"
+    s.pod_target_xcconfig    = {
+        "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\"",
+        "CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
+    }
+
+    s.dependency "React-Codegen"
+    s.dependency "RCT-Folly", folly_version
+    s.dependency "RCTRequired"
+    s.dependency "RCTTypeSafety"
+    s.dependency "ReactCommon/turbomodule/core"
+  end
 end

package/android/build.gradle

@@ -2,13 +2,20 @@ def safeExtGet(prop, fallback) {
     rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
 }
 
+def isNewArchitectureEnabled() {
+    return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true"
+}
+
 apply plugin: 'com.android.library'
+if (isNewArchitectureEnabled()) {
+    apply plugin: 'com.facebook.react'
+}
 
 android {
     compileSdkVersion safeExtGet('compileSdkVersion', 31)
 
     defaultConfig {
-        minSdkVersion safeExtGet('minSdkVersion', 16)
+        minSdkVersion safeExtGet('minSdkVersion', 21)
         targetSdkVersion safeExtGet('targetSdkVersion', 31)
         versionCode 1
         versionName "1.0"
@@ -19,10 +26,21 @@ android {
             sourceCompatibility JavaVersion.VERSION_1_8
             targetCompatibility JavaVersion.VERSION_1_8
         }
+        buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
+    }
+
+    sourceSets {
+        main {
+            if (isNewArchitectureEnabled()) {
+                java.srcDirs += ['src/newarch']
+            } else {
+                java.srcDirs += ['src/oldarch']
+            }
+        }
     }
 }
 
 dependencies {
     implementation 'com.facebook.react:react-native:+'
-    api 'io.sentry:sentry-android:6.4.2'
+    api 'io.sentry:sentry-android:6.5.0'
 }

package/android/src/main/java/io/sentry/react/{RNSentryModule.java → RNSentryModuleImpl.java}

@@ -6,24 +6,19 @@ import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.util.SparseIntArray;
 
+import androidx.annotation.Nullable;
 import androidx.core.app.FrameMetricsAggregator;
 
 import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.LifecycleEventListener;
 import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContextBaseJavaModule;
-import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.ReadableMapKeySetIterator;
 import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.module.annotations.ReactModule;
 
 import java.io.File;
 import java.io.FileOutputStream;
-import java.io.UnsupportedEncodingException;
-import java.nio.charset.Charset;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -32,32 +27,32 @@ import java.util.UUID;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import io.sentry.SentryEvent;
-import io.sentry.android.core.AnrIntegration;
-import io.sentry.android.core.AppStartState;
-import io.sentry.android.core.NdkIntegration;
-import io.sentry.android.core.SentryAndroid;
 import io.sentry.Breadcrumb;
 import io.sentry.HubAdapter;
 import io.sentry.Integration;
 import io.sentry.Sentry;
+import io.sentry.SentryEvent;
 import io.sentry.SentryLevel;
 import io.sentry.UncaughtExceptionHandlerIntegration;
+import io.sentry.android.core.AnrIntegration;
+import io.sentry.android.core.AppStartState;
+import io.sentry.android.core.NdkIntegration;
+import io.sentry.android.core.SentryAndroid;
 import io.sentry.protocol.SdkVersion;
 import io.sentry.protocol.SentryException;
 import io.sentry.protocol.SentryPackage;
 import io.sentry.protocol.User;
 
-@ReactModule(name = RNSentryModule.NAME)
-public class RNSentryModule extends ReactContextBaseJavaModule {
+public class RNSentryModuleImpl {
 
     public static final String NAME = "RNSentry";
 
     private static final Logger logger = Logger.getLogger("react-native-sentry");
 
-    private PackageInfo packageInfo = null;
+    private final ReactApplicationContext reactApplicationContext;
+    private final PackageInfo packageInfo;
     private FrameMetricsAggregator frameMetricsAggregator = null;
-    private boolean androidXAvailable = true;
+    private boolean androidXAvailable;
 
     private static boolean didFetchAppStart;
 
@@ -66,25 +61,20 @@ public class RNSentryModule extends ReactContextBaseJavaModule {
     // 16ms (slower than 60fps) to constitute slow frames.
     private static final int SLOW_FRAME_THRESHOLD = 16;
 
-    public RNSentryModule(ReactApplicationContext reactContext) {
-        super(reactContext);
-        packageInfo = getPackageInfo(reactContext);
+    public RNSentryModuleImpl(ReactApplicationContext reactApplicationContext) {
+        packageInfo = getPackageInfo(reactApplicationContext);
+        this.reactApplicationContext = reactApplicationContext;
     }
 
-    @Override
-    public String getName() {
-        return NAME;
+    private ReactApplicationContext getReactApplicationContext() {
+        return this.reactApplicationContext;
     }
 
-    @Override
-    public Map<String, Object> getConstants() {
-        final Map<String, Object> constants = new HashMap<>();
-        constants.put("nativeClientAvailable", true);
-        constants.put("nativeTransport", true);
-        return constants;
+    private @Nullable
+    Activity getCurrentActivity() {
+        return this.reactApplicationContext.getCurrentActivity();
     }
 
-    @ReactMethod
     public void initNativeSdk(final ReadableMap rnOptions, Promise promise) {
         SentryAndroid.init(this.getReactApplicationContext(), options -> {
             if (rnOptions.hasKey("debug") && rnOptions.getBoolean("debug")) {
@@ -99,6 +89,9 @@ public class RNSentryModule extends ReactContextBaseJavaModule {
                 // SentryAndroid needs an empty string fallback for the dsn.
                 options.setDsn("");
             }
+            if (rnOptions.hasKey("sendClientReports")) {
+                options.setSendClientReports(rnOptions.getBoolean("sendClientReports"));
+            }
             if (rnOptions.hasKey("maxBreadcrumbs")) {
                 options.setMaxBreadcrumbs(rnOptions.getInt("maxBreadcrumbs"));
             }
@@ -130,36 +123,13 @@ public class RNSentryModule extends ReactContextBaseJavaModule {
                 options.setAttachStacktrace(rnOptions.getBoolean("attachStacktrace"));
             }
             if (rnOptions.hasKey("attachThreads")) {
-                // JS use top level stacktraces and android attaches Threads which hides them so
+                // JS use top level stacktrace and android attaches Threads which hides them so
                 // by default we hide.
                 options.setAttachThreads(rnOptions.getBoolean("attachThreads"));
             }
             if (rnOptions.hasKey("sendDefaultPii")) {
                 options.setSendDefaultPii(rnOptions.getBoolean("sendDefaultPii"));
             }
-            if (rnOptions.hasKey("enableAutoPerformanceTracking")
-                    && rnOptions.getBoolean("enableAutoPerformanceTracking")) {
-                androidXAvailable = checkAndroidXAvailability();
-
-                if (androidXAvailable) {
-                    frameMetricsAggregator = new FrameMetricsAggregator();
-                    final Activity currentActivity = getCurrentActivity();
-
-                    if (frameMetricsAggregator != null && currentActivity != null) {
-                        try {
-                            frameMetricsAggregator.add(currentActivity);
-                        } catch (Throwable ignored) {
-                            // throws ConcurrentModification when calling addOnFrameMetricsAvailableListener
-                            // this is a best effort since we can't reproduce it
-                            logger.warning("Error adding Activity to frameMetricsAggregator.");
-                        }
-                    }
-                } else {
-                    logger.warning("androidx.core' isn't available as a dependency.");
-                }
-            } else {
-                this.disableNativeFramesTracking();
-            }
 
             options.setBeforeSend((event, hint) -> {
                 // React native internally throws a JavascriptException
@@ -190,18 +160,16 @@ public class RNSentryModule extends ReactContextBaseJavaModule {
                 }
             }
 
-            logger.info(String.format("Native Integrations '%s'", options.getIntegrations().toString()));
+            logger.info(String.format("Native Integrations '%s'", options.getIntegrations()));
         });
 
         promise.resolve(true);
     }
 
-    @ReactMethod
     public void crash() {
         throw new RuntimeException("TEST - Sentry Client Crash (only works in release mode)");
     }
 
-    @ReactMethod
     public void fetchNativeRelease(Promise promise) {
         WritableMap release = Arguments.createMap();
         release.putString("id", packageInfo.packageName);
@@ -210,7 +178,6 @@ public class RNSentryModule extends ReactContextBaseJavaModule {
         promise.resolve(release);
     }
 
-    @ReactMethod
     public void fetchNativeAppStart(Promise promise) {
         final AppStartState appStartInstance = AppStartState.getInstance();
         final Date appStartTime = appStartInstance.getAppStartTime();
@@ -242,7 +209,6 @@ public class RNSentryModule extends ReactContextBaseJavaModule {
     /**
      * Returns frames metrics at the current point in time.
      */
-    @ReactMethod
     public void fetchNativeFrames(Promise promise) {
         if (!isFrameMetricsAggregatorAvailable()) {
             promise.resolve(null);
@@ -292,9 +258,8 @@ public class RNSentryModule extends ReactContextBaseJavaModule {
         }
     }
 
-    @ReactMethod
     public void captureEnvelope(ReadableArray rawBytes, ReadableMap options, Promise promise) {
-        byte bytes[] = new byte[rawBytes.size()];
+        byte[] bytes = new byte[rawBytes.size()];
         for (int i = 0; i < rawBytes.size(); i++) {
             bytes[i] = (byte) rawBytes.getInt(i);
         }
@@ -326,7 +291,6 @@ public class RNSentryModule extends ReactContextBaseJavaModule {
         }
     }
 
-    @ReactMethod
     public void setUser(final ReadableMap user, final ReadableMap otherUserKeys) {
         Sentry.configureScope(scope -> {
             if (user == null && otherUserKeys == null) {
@@ -353,13 +317,16 @@ public class RNSentryModule extends ReactContextBaseJavaModule {
                 }
 
                 if (otherUserKeys != null) {
-                    HashMap<String, String> otherUserKeysMap = new HashMap<String, String>();
+                    HashMap<String, String> otherUserKeysMap = new HashMap<>();
                     ReadableMapKeySetIterator it = otherUserKeys.keySetIterator();
                     while (it.hasNextKey()) {
                         String key = it.nextKey();
                         String value = otherUserKeys.getString(key);
 
-                        otherUserKeysMap.put(key, value);
+                        // other is ConcurrentHashMap and can't have null values
+                        if (value != null) {
+                            otherUserKeysMap.put(key, value);
+                        }
                     }
 
                     userInstance.setOthers(otherUserKeysMap);
@@ -370,7 +337,6 @@ public class RNSentryModule extends ReactContextBaseJavaModule {
         });
     }
 
-    @ReactMethod
     public void addBreadcrumb(final ReadableMap breadcrumb) {
         Sentry.configureScope(scope -> {
             Breadcrumb breadcrumbInstance = new Breadcrumb();
@@ -395,29 +361,27 @@ public class RNSentryModule extends ReactContextBaseJavaModule {
                     case "warning":
                         breadcrumbInstance.setLevel(SentryLevel.WARNING);
                         break;
-                    case "info":
-                        breadcrumbInstance.setLevel(SentryLevel.INFO);
-                        break;
                     case "debug":
                         breadcrumbInstance.setLevel(SentryLevel.DEBUG);
                         break;
                     case "error":
                         breadcrumbInstance.setLevel(SentryLevel.ERROR);
                         break;
+                    case "info":
                     default:
-                        breadcrumbInstance.setLevel(SentryLevel.ERROR);
+                        breadcrumbInstance.setLevel(SentryLevel.INFO);
                         break;
                 }
             }
 
             if (breadcrumb.hasKey("data")) {
-                ReadableMap data = breadcrumb.getMap("data");
-                ReadableMapKeySetIterator it = data.keySetIterator();
-                while (it.hasNextKey()) {
-                    String key = it.nextKey();
-                    String value = data.getString(key);
-
-                    breadcrumbInstance.setData(key, value);
+                final ReadableMap data = breadcrumb.getMap("data");
+                for (final Map.Entry<String, Object> entry : data.toHashMap().entrySet()) {
+                    final Object value = entry.getValue();
+                    // data is ConcurrentHashMap and can't have null values
+                    if (value != null) {
+                        breadcrumbInstance.setData(entry.getKey(), entry.getValue());
+                    }
                 }
             }
 
@@ -425,21 +389,18 @@ public class RNSentryModule extends ReactContextBaseJavaModule {
         });
     }
 
-    @ReactMethod
     public void clearBreadcrumbs() {
         Sentry.configureScope(scope -> {
             scope.clearBreadcrumbs();
         });
     }
 
-    @ReactMethod
     public void setExtra(String key, String extra) {
         Sentry.configureScope(scope -> {
             scope.setExtra(key, extra);
         });
     }
 
-    @ReactMethod
     public void setContext(final String key, final ReadableMap context) {
         if (key == null || context == null) {
             return;
@@ -451,14 +412,12 @@ public class RNSentryModule extends ReactContextBaseJavaModule {
         });
     }
 
-    @ReactMethod
     public void setTag(String key, String value) {
         Sentry.configureScope(scope -> {
             scope.setTag(key, value);
         });
     }
 
-    @ReactMethod
     public void closeNativeSdk(Promise promise) {
         Sentry.close();
 
@@ -467,7 +426,31 @@ public class RNSentryModule extends ReactContextBaseJavaModule {
         promise.resolve(true);
     }
 
-    @ReactMethod
+    public void enableNativeFramesTracking() {
+        androidXAvailable = checkAndroidXAvailability();
+
+        if (androidXAvailable) {
+            frameMetricsAggregator = new FrameMetricsAggregator();
+            final Activity currentActivity = getCurrentActivity();
+
+            if (frameMetricsAggregator != null && currentActivity != null) {
+                try {
+                    frameMetricsAggregator.add(currentActivity);
+
+                    logger.info("FrameMetricsAggregator installed.");
+                } catch (Throwable ignored) {
+                    // throws ConcurrentModification when calling addOnFrameMetricsAvailableListener
+                    // this is a best effort since we can't reproduce it
+                    logger.severe("Error adding Activity to frameMetricsAggregator.");
+                }
+            } else {
+                logger.info("currentActivity isn't available.");
+            }
+        } else {
+            logger.warning("androidx.core' isn't available as a dependency.");
+        }
+    }
+
     public void disableNativeFramesTracking() {
         if (isFrameMetricsAggregatorAvailable()) {
             frameMetricsAggregator.stop();
@@ -482,10 +465,10 @@ public class RNSentryModule extends ReactContextBaseJavaModule {
                 // If the event is from capacitor js, it gets set there and we do not handle it
                 // here.
                 case "sentry.native":
-                    setEventEnvironmentTag(event, "android", "native");
+                    setEventEnvironmentTag(event, "native");
                     break;
                 case "sentry.java.android":
-                    setEventEnvironmentTag(event, "android", "java");
+                    setEventEnvironmentTag(event, "java");
                     break;
                 default:
                     break;
@@ -493,8 +476,8 @@ public class RNSentryModule extends ReactContextBaseJavaModule {
         }
     }
 
-    private void setEventEnvironmentTag(SentryEvent event, String origin, String environment) {
-        event.setTag("event.origin", origin);
+    private void setEventEnvironmentTag(SentryEvent event, String environment) {
+        event.setTag("event.origin", "android");
         event.setTag("event.environment", environment);
     }
 

package/android/src/main/java/io/sentry/react/RNSentryPackage.java

@@ -1,30 +1,46 @@
 package io.sentry.react;
 
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
+import androidx.annotation.Nullable;
+
+import java.util.HashMap;
+import java.util.Map;
 
-import com.facebook.react.ReactPackage;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.uimanager.ViewManager;
-import com.facebook.react.bridge.JavaScriptModule;
+import com.facebook.react.module.model.ReactModuleInfo;
+import com.facebook.react.module.model.ReactModuleInfoProvider;
+import com.facebook.react.TurboReactPackage;
 
-public class RNSentryPackage implements ReactPackage {
-    public RNSentryPackage() {
-    }
+public class RNSentryPackage extends TurboReactPackage {
 
-    @Override
-    public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
-        return Arrays.<NativeModule>asList(new RNSentryModule(reactContext));
+  @Nullable
+  @Override
+  public NativeModule getModule(String name, ReactApplicationContext reactContext) {
+    if (name.equals(RNSentryModuleImpl.NAME)) {
+      return new RNSentryModule(reactContext);
+    } else {
+      return null;
     }
+  }
 
-    public List<Class<? extends JavaScriptModule>> createJSModules() {
-        return Collections.emptyList();
-    }
+  @Override
+  public ReactModuleInfoProvider getReactModuleInfoProvider() {
+    return () -> {
+      final Map<String, ReactModuleInfo> moduleInfos = new HashMap<>();
+      boolean isTurboModule = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED;
+      moduleInfos.put(
+          RNSentryModuleImpl.NAME,
+          new ReactModuleInfo(
+              RNSentryModuleImpl.NAME,
+              RNSentryModuleImpl.NAME,
+              false, // canOverrideExistingModule
+              false, // needsEagerInit
+              true, // hasConstants
+              false, // isCxxModule
+              isTurboModule // isTurboModule
+      ));
+      return moduleInfos;
+    };
+  }
 
-    @Override
-    public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
-        return Collections.emptyList();
-    }
 }