diff --git a/CHANGELOG.md b/CHANGELOG.md index 8597931684..b9e5ded88e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ ### Fixes +- Capture native exceptions consumed by Expo's bridgeless error handling on Android ([#5871](https://github.com/getsentry/sentry-react-native/pull/5871)) - Fix SIGABRT crash on launch when `mobileReplayIntegration` is not configured and iOS deployment target >= 16.0 ([#5858](https://github.com/getsentry/sentry-react-native/pull/5858)) - Reduce `reactNavigationIntegration` performance overhead ([#5840](https://github.com/getsentry/sentry-react-native/pull/5840), [#5842](https://github.com/getsentry/sentry-react-native/pull/5842), [#5849](https://github.com/getsentry/sentry-react-native/pull/5849)) - Fix duplicated breadcrumbs on Android ([#5841](https://github.com/getsentry/sentry-react-native/pull/5841)) diff --git a/packages/core/.npmignore b/packages/core/.npmignore index cf002a00a5..49af5a37e2 100644 --- a/packages/core/.npmignore +++ b/packages/core/.npmignore @@ -37,3 +37,4 @@ !/expo.d.ts !/app.plugin.js !/plugin/build/**/* +!/expo-module.config.json diff --git a/packages/core/RNSentryAndroidTester/app/build.gradle b/packages/core/RNSentryAndroidTester/app/build.gradle index 26334b0f85..53173e7034 100644 --- a/packages/core/RNSentryAndroidTester/app/build.gradle +++ b/packages/core/RNSentryAndroidTester/app/build.gradle @@ -37,9 +37,12 @@ android { } } +android.sourceSets.main.java.srcDirs += ['../../android/src/expo/java'] + dependencies { implementation project(':RNSentry') implementation 'com.facebook.react:react-android:0.72.0' + implementation files('../../android/libs/expo-stubs.jar') implementation 'androidx.core:core-ktx:1.7.0' implementation 'androidx.appcompat:appcompat:1.4.1' implementation 'com.google.android.material:material:1.5.0' diff --git a/packages/core/RNSentryAndroidTester/app/src/test/java/io/sentry/react/expo/SentryReactNativeHostHandlerTest.kt b/packages/core/RNSentryAndroidTester/app/src/test/java/io/sentry/react/expo/SentryReactNativeHostHandlerTest.kt new file mode 100644 index 0000000000..8a1e0c3c6c --- /dev/null +++ b/packages/core/RNSentryAndroidTester/app/src/test/java/io/sentry/react/expo/SentryReactNativeHostHandlerTest.kt @@ -0,0 +1,96 @@ +package io.sentry.react.expo + +import io.sentry.Sentry +import io.sentry.exception.ExceptionMechanismException +import org.junit.After +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertNotNull +import org.junit.Assert.assertTrue +import org.junit.Test +import org.junit.runner.RunWith +import org.junit.runners.JUnit4 +import org.mockito.MockedStatic +import org.mockito.Mockito.mockStatic +import org.mockito.kotlin.any +import org.mockito.kotlin.argumentCaptor +import org.mockito.kotlin.never +import org.mockito.kotlin.verify + +@RunWith(JUnit4::class) +class SentryReactNativeHostHandlerTest { + private var sentryMock: MockedStatic? = null + + @After + fun tearDown() { + sentryMock?.close() + } + + @Test + fun `does not capture when in developer support mode`() { + sentryMock = + mockStatic(Sentry::class.java).also { + it.`when` { Sentry.isEnabled() }.thenReturn(true) + } + + val handler = SentryReactNativeHostHandler() + handler.onReactInstanceException(true, RuntimeException("test")) + + sentryMock!!.verify({ Sentry.captureException(any()) }, never()) + } + + @Test + fun `does not capture when sentry is not enabled`() { + sentryMock = + mockStatic(Sentry::class.java).also { + it.`when` { Sentry.isEnabled() }.thenReturn(false) + } + + val handler = SentryReactNativeHostHandler() + handler.onReactInstanceException(false, RuntimeException("test")) + + sentryMock!!.verify({ Sentry.captureException(any()) }, never()) + } + + @Test + fun `captures exception with unhandled mechanism when sentry is enabled`() { + sentryMock = + mockStatic(Sentry::class.java).also { + it.`when` { Sentry.isEnabled() }.thenReturn(true) + } + + val handler = SentryReactNativeHostHandler() + val originalException = IllegalStateException("Fabric crash") + + handler.onReactInstanceException(false, originalException) + + val captor = argumentCaptor() + sentryMock!!.verify { Sentry.captureException(captor.capture()) } + + val captured = captor.firstValue + assertTrue( + "Expected ExceptionMechanismException but got ${captured::class.java}", + captured is ExceptionMechanismException, + ) + + val mechanismException = captured as ExceptionMechanismException + val mechanism = mechanismException.exceptionMechanism + assertEquals("expoReactHost", mechanism.type) + assertFalse("Mechanism should be unhandled", mechanism.isHandled!!) + assertEquals(originalException, mechanismException.throwable) + assertNotNull(mechanismException.thread) + } + + @Test + fun `does not throw when sentry capture fails`() { + sentryMock = + mockStatic(Sentry::class.java).also { + it.`when` { Sentry.isEnabled() }.thenReturn(true) + it.`when` { Sentry.captureException(any()) }.thenThrow(RuntimeException("Sentry internal error")) + } + + val handler = SentryReactNativeHostHandler() + // Should not throw + handler.onReactInstanceException(false, IllegalStateException("test")) + } +} diff --git a/packages/core/android/build.gradle b/packages/core/android/build.gradle index 8f080dd7b7..27e18d53ec 100644 --- a/packages/core/android/build.gradle +++ b/packages/core/android/build.gradle @@ -48,12 +48,14 @@ android { } else { java.srcDirs += ['src/oldarch'] } + java.srcDirs += ['src/expo'] } } } dependencies { compileOnly files('libs/replay-stubs.jar') + compileOnly files('libs/expo-stubs.jar') implementation 'com.facebook.react:react-native:+' api 'io.sentry:sentry-android:8.36.0' debugImplementation 'io.sentry:sentry-spotlight:8.36.0' diff --git a/packages/core/android/expo-stubs/README.md b/packages/core/android/expo-stubs/README.md new file mode 100644 index 0000000000..501a77caab --- /dev/null +++ b/packages/core/android/expo-stubs/README.md @@ -0,0 +1,7 @@ +This module provides stubs for `expo-modules-core` interfaces (`Package` and `ReactNativeHostHandler`) needed to compile the Expo-specific source set (`android/src/expo/`). + +The Expo source set registers a `ReactNativeHostHandler` that captures native exceptions swallowed by Expo's bridgeless error handling (`ExpoReactHostDelegate.handleInstanceException`). These stubs are added as a `compileOnly` dependency to `android/build.gradle` (meaning, they are not present at runtime). In Expo projects, the real `expo-modules-core` classes are available at runtime via Expo's autolinking. + +## Updating the stubs + +To update the stubs, just run `yarn build` from the root of the repo and it will recompile the classes and put them under `packages/core/android/libs/expo-stubs.jar`. Check this newly generated `.jar` in and push. diff --git a/packages/core/android/expo-stubs/build.gradle b/packages/core/android/expo-stubs/build.gradle new file mode 100644 index 0000000000..71630a4f47 --- /dev/null +++ b/packages/core/android/expo-stubs/build.gradle @@ -0,0 +1,23 @@ +allprojects { + repositories { + mavenCentral() + google() + } +} + +apply plugin: 'java-library' + +java { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 +} + +tasks.named('jar', Jar) { + archiveBaseName.set('expo-stubs') + archiveVersion.set('') + destinationDirectory.set(file("$rootDir/../libs")) +} + +dependencies { + compileOnly 'com.google.android:android:4.1.1.4' +} diff --git a/packages/core/android/expo-stubs/gradle/wrapper/gradle-wrapper.jar b/packages/core/android/expo-stubs/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000..9bbc975c74 Binary files /dev/null and b/packages/core/android/expo-stubs/gradle/wrapper/gradle-wrapper.jar differ diff --git a/packages/core/android/expo-stubs/gradle/wrapper/gradle-wrapper.properties b/packages/core/android/expo-stubs/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000000..37f853b1c8 --- /dev/null +++ b/packages/core/android/expo-stubs/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/packages/core/android/expo-stubs/gradlew b/packages/core/android/expo-stubs/gradlew new file mode 100755 index 0000000000..faf93008b7 --- /dev/null +++ b/packages/core/android/expo-stubs/gradlew @@ -0,0 +1,251 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/packages/core/android/expo-stubs/gradlew.bat b/packages/core/android/expo-stubs/gradlew.bat new file mode 100644 index 0000000000..9b42019c79 --- /dev/null +++ b/packages/core/android/expo-stubs/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/packages/core/android/expo-stubs/settings.gradle b/packages/core/android/expo-stubs/settings.gradle new file mode 100644 index 0000000000..9406d803d6 --- /dev/null +++ b/packages/core/android/expo-stubs/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'expo-stubs' diff --git a/packages/core/android/expo-stubs/src/main/java/expo/modules/core/interfaces/Package.java b/packages/core/android/expo-stubs/src/main/java/expo/modules/core/interfaces/Package.java new file mode 100644 index 0000000000..676251816e --- /dev/null +++ b/packages/core/android/expo-stubs/src/main/java/expo/modules/core/interfaces/Package.java @@ -0,0 +1,11 @@ +package expo.modules.core.interfaces; + +import android.content.Context; +import java.util.Collections; +import java.util.List; + +public interface Package { + default List createReactNativeHostHandlers(Context context) { + return Collections.emptyList(); + } +} diff --git a/packages/core/android/expo-stubs/src/main/java/expo/modules/core/interfaces/ReactNativeHostHandler.java b/packages/core/android/expo-stubs/src/main/java/expo/modules/core/interfaces/ReactNativeHostHandler.java new file mode 100644 index 0000000000..5c00df9c12 --- /dev/null +++ b/packages/core/android/expo-stubs/src/main/java/expo/modules/core/interfaces/ReactNativeHostHandler.java @@ -0,0 +1,7 @@ +package expo.modules.core.interfaces; + +public interface ReactNativeHostHandler { + default void onReactInstanceException(boolean useDeveloperSupport, Exception exception) { + // default empty implementation + } +} diff --git a/packages/core/android/libs/expo-stubs.jar b/packages/core/android/libs/expo-stubs.jar new file mode 100644 index 0000000000..522855527e Binary files /dev/null and b/packages/core/android/libs/expo-stubs.jar differ diff --git a/packages/core/android/src/expo/java/io/sentry/react/expo/SentryExpoPackage.java b/packages/core/android/src/expo/java/io/sentry/react/expo/SentryExpoPackage.java new file mode 100644 index 0000000000..8543c3bb72 --- /dev/null +++ b/packages/core/android/src/expo/java/io/sentry/react/expo/SentryExpoPackage.java @@ -0,0 +1,22 @@ +package io.sentry.react.expo; + +import android.content.Context; +import expo.modules.core.interfaces.Package; +import expo.modules.core.interfaces.ReactNativeHostHandler; +import java.util.Collections; +import java.util.List; + +/** + * Expo package that registers {@link SentryReactNativeHostHandler} to capture native exceptions + * swallowed by Expo's bridgeless error handling. + * + *

This package is auto-discovered by Expo's autolinking system when {@code @sentry/react-native} + * is installed in an Expo project. It is not used in non-Expo React Native projects. + */ +public class SentryExpoPackage implements Package { + + @Override + public List createReactNativeHostHandlers(Context context) { + return Collections.singletonList(new SentryReactNativeHostHandler()); + } +} diff --git a/packages/core/android/src/expo/java/io/sentry/react/expo/SentryReactNativeHostHandler.java b/packages/core/android/src/expo/java/io/sentry/react/expo/SentryReactNativeHostHandler.java new file mode 100644 index 0000000000..eda4ef2732 --- /dev/null +++ b/packages/core/android/src/expo/java/io/sentry/react/expo/SentryReactNativeHostHandler.java @@ -0,0 +1,48 @@ +package io.sentry.react.expo; + +import androidx.annotation.NonNull; +import expo.modules.core.interfaces.ReactNativeHostHandler; +import io.sentry.Sentry; +import io.sentry.exception.ExceptionMechanismException; +import io.sentry.protocol.Mechanism; + +/** + * Captures native Android exceptions that are routed through Expo's {@code + * ExpoReactHostDelegate.handleInstanceException}. + * + *

On Expo SDK 53+, certain native exceptions (e.g., IllegalStateException from Fabric's + * SurfaceMountingManager) are caught by React Native and routed to {@code handleInstanceException}. + * Expo's implementation iterates registered host handlers but does not rethrow, so the exception + * never reaches Java's {@code UncaughtExceptionHandler} which Sentry relies on for crash capture. + * + *

This handler captures those exceptions directly via {@code Sentry.captureException} with an + * unhandled mechanism, ensuring they appear as crashes in Sentry. + */ +public class SentryReactNativeHostHandler implements ReactNativeHostHandler { + + private static final String MECHANISM_TYPE = "expoReactHost"; + + @Override + public void onReactInstanceException(boolean useDeveloperSupport, @NonNull Exception exception) { + if (useDeveloperSupport) { + return; + } + + if (!Sentry.isEnabled()) { + return; + } + + try { // NOPMD - We don't want to crash in any case + final Mechanism mechanism = new Mechanism(); + mechanism.setType(MECHANISM_TYPE); + mechanism.setHandled(false); + + final ExceptionMechanismException mechanismException = + new ExceptionMechanismException(mechanism, exception, Thread.currentThread()); + + Sentry.captureException(mechanismException); + } catch (Throwable ignored) { // NOPMD - We don't want to crash in any case + // ignore + } + } +} diff --git a/packages/core/expo-module.config.json b/packages/core/expo-module.config.json new file mode 100644 index 0000000000..339d64e117 --- /dev/null +++ b/packages/core/expo-module.config.json @@ -0,0 +1,3 @@ +{ + "platforms": ["android"] +} diff --git a/packages/core/package.json b/packages/core/package.json index 754a6fe2b1..ad38ba26ac 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -18,13 +18,14 @@ }, "main": "dist/js/index.js", "scripts": { - "build": "npx run-s build:sdk downlevel build:tools build:plugin build:replay-stubs", + "build": "npx run-s build:sdk downlevel build:tools build:plugin build:replay-stubs build:expo-stubs", "build:sdk": "tsc -p tsconfig.build.json", "build:sdk:watch": "tsc -p tsconfig.build.json -w --preserveWatchOutput", "build:tools": "tsc -p tsconfig.build.tools.json", "build:tools:watch": "tsc -p tsconfig.build.tools.json -w --preserveWatchOutput", "build:plugin": "EXPO_NONINTERACTIVE=true expo-module build plugin", "build:replay-stubs": "cd android/replay-stubs && ./gradlew jar", + "build:expo-stubs": "cd android/expo-stubs && ./gradlew jar", "build:tarball": "bash scripts/build-tarball.sh", "downlevel": "downlevel-dts dist ts3.8/dist --to=3.8", "clean": "rimraf dist coverage && yarn clean:plugin",