chore: Merge Android UI profiling on the capture startup crashes branch #5544
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
Semver Impact of This PR⚪ None (no version bump detected) 📋 Changelog PreviewThis is how your changes will appear in the changelog. This PR will not appear in the changelog. 🤖 This preview updates automatically when you update the PR. |
alwx
approved these changes
Jan 15, 2026
Collaborator
|
@sentry review |
lucas-zimerman
approved these changes
Jan 15, 2026
Collaborator
lucas-zimerman
left a comment
lucas-zimerman
left a comment
There was a problem hiding this comment.
Looking good! LGTM!
lucas-zimerman
requested changes
Jan 15, 2026
Collaborator
lucas-zimerman
left a comment
lucas-zimerman
left a comment
There was a problem hiding this comment.
There seems to be some issues with the added logs on android
Contributor
iOS (new) Performance metrics 🚀
|
| Revision | Plain | With Sentry | Diff |
|---|---|---|---|
| 60d1e83+dirty | 1201.87 ms | 1204.61 ms | 2.74 ms |
| 99179a4+dirty | 1210.16 ms | 1213.57 ms | 3.40 ms |
| f26d7a8+dirty | 1227.33 ms | 1220.67 ms | -6.66 ms |
App size
| Revision | Plain | With Sentry | Diff |
|---|---|---|---|
| 60d1e83+dirty | 3.41 MiB | 4.67 MiB | 1.26 MiB |
| 99179a4+dirty | 3.44 MiB | 4.67 MiB | 1.23 MiB |
| f26d7a8+dirty | 3.44 MiB | 4.67 MiB | 1.23 MiB |
Contributor
iOS (legacy) Performance metrics 🚀
|
| Revision | Plain | With Sentry | Diff |
|---|---|---|---|
| 60d1e83+dirty | 1207.79 ms | 1207.35 ms | -0.44 ms |
| 99179a4+dirty | 1213.96 ms | 1215.34 ms | 1.38 ms |
| f26d7a8+dirty | 1209.49 ms | 1207.54 ms | -1.95 ms |
App size
| Revision | Plain | With Sentry | Diff |
|---|---|---|---|
| 60d1e83+dirty | 3.41 MiB | 4.67 MiB | 1.26 MiB |
| 99179a4+dirty | 3.44 MiB | 4.67 MiB | 1.23 MiB |
| f26d7a8+dirty | 3.44 MiB | 4.67 MiB | 1.23 MiB |
Contributor
Author
Good catch @lucas-zimerman 👍 Glad I didn't rush to merge this 😅 |
![sentry[bot]](https://avatars.githubusercontent.com/in/12637?s=60&v=4){kind=small}
packages/core/android/src/main/java/io/sentry/react/RNSentryStart.java
Outdated
Show resolved
Hide resolved
Contributor
Android (new) Performance metrics 🚀
|
| Revision | Plain | With Sentry | Diff |
|---|---|---|---|
| f26d7a8+dirty | 380.15 ms | 407.84 ms | 27.68 ms |
| 99179a4+dirty | 357.38 ms | 375.64 ms | 18.26 ms |
| 60d1e83+dirty | 406.16 ms | 422.83 ms | 16.67 ms |
App size
| Revision | Plain | With Sentry | Diff |
|---|---|---|---|
| f26d7a8+dirty | 43.94 MiB | 48.90 MiB | 4.96 MiB |
| 99179a4+dirty | 43.94 MiB | 48.90 MiB | 4.96 MiB |
| 60d1e83+dirty | 43.94 MiB | 48.90 MiB | 4.96 MiB |
Contributor
Android (legacy) Performance metrics 🚀
|
| Revision | Plain | With Sentry | Diff |
|---|---|---|---|
| f26d7a8+dirty | 571.36 ms | 637.92 ms | 66.56 ms |
| 99179a4+dirty | 405.13 ms | 415.16 ms | 10.03 ms |
| 60d1e83+dirty | 396.72 ms | 390.04 ms | -6.68 ms |
App size
| Revision | Plain | With Sentry | Diff |
|---|---|---|---|
| f26d7a8+dirty | 43.75 MiB | 48.08 MiB | 4.32 MiB |
| 99179a4+dirty | 43.75 MiB | 48.08 MiB | 4.32 MiB |
| 60d1e83+dirty | 43.75 MiB | 48.08 MiB | 4.32 MiB |
antonis
added a commit
that referenced
this pull request
Jan 29, 2026
* ref(ios): Extract Cocoa SDK init into standalone file (#4442) * ref(android): Extracts Android native initialization to standalone structures (#4445) * Extract Android SDK Init * Update tests * Adds changelog * Fix lint issues * Rename RNSentryStart instance for clarity * Converts RNSentryStart to utility class * Update CHANGELOG.md --------- Co-authored-by: Krystof Woldrich <[email protected]> * feat(experimental): Add native `startWithConfigureOptions` for Apple platforms (#4444) * feat: Read `sentry.options.json` during cocoa init (#4447) * Adds utility class for converting `JsonObject` to `WritableMap` (#4479) * Convert json object to writable map * Make class/methods package-private(default) * feat: Automatically load `sentry.options.json` file (#4476) * feat(experimental): Initialize Android SDK from json configuration (#4451) * misc: Add `sentry.options.json` example to the changelog (#4509) * feat(init): Load options from `sentry.options.json` in JS (#4510) * release: 6.7.0-alpha.0 * misc(sample): Change RN Sample to use native file init by default (#4522) * chore(sample-rn): Remove duplicate init options from code (#4532) * chore(sample-rn): Always use fhe file option (including auto init) (#4533) * internal(sample-rn): Add Detox for integration/e2e tests of the rn sample (#4535) * internal(sample-rn): Add header and message envelope tests (#4536) * fix(sample-e2e): Fix type errors missing sentry/core and afterAll (#4564) * chore(samples): Add package scripts for native builds, dsn and testing (#4561) * test(e2e): Verify captured Errors Screen transaction (#4584) * test(e2e): Add auto init from JS tests (#4588) * test(e2e): Add app start crash test for iOS (#4593) * test(e2e): Avoid race conditions when waiting for captured message (#4595) * chore(sample-e2e): Move Detox related files to e2e-detox dir * fix: remove unused SentryPackage import Removed unused import that was causing CI lint failure * fix: update RNSentryStartTest for Sentry Android SDK v7 API changes - Removed assertions for packages getter (not available in v7) - Removed assertion for enableTracing property (removed in v7) - Added comments explaining the API changes * fix: remove unused addPackages method to fix PMD lint error The method was a no-op after v7 API changes, so removing it entirely to avoid unused parameter warnings from PMD. * fix: update RNSentrySDKTest for Sentry Android SDK v7 API changes - Removed assertions for enableTracing property (removed in v7) - Removed assertions for packages getter (not available in v7) - Added comments explaining the API changes * fix: use relative path for RNSentrySDK+Test.h import in bridging header The file is in the parent directory, so use ../ prefix to fix the import path * fix: remove deprecated enableTracing property in iOS RNSentryStart The property is deprecated in v7. Tracing is already disabled by setting tracesSampleRate and tracesSampler to nil. * fix: remove enableTracing assertions from iOS tests The enableTracing property is deprecated in Sentry Cocoa SDK v7. Tracing is already verified to be disabled by checking that tracesSampleRate and tracesSampler are nil. * Update Podspec * Fix lint issue * ref(sample-e2e): v7: Migrate from Detox to Maestro (#5473) * chore(sample-e2e): Migrate from Detox to Maestro * fix set dsn script path * fix: Update script paths after detox-to-maestro migration The set-dsn scripts were moved from scripts/detox/ to scripts/ during the migration * Update script paths * Fix tests * Fix test failure * Fix idle issue * fix(e2e): Fix Maestro flows for captureMessage and captureSpaceflightNewsScreen - Add scrollUntilVisible for 'Capture message' button (might be off-screen) - Add proper waiting and scrolling for SpaceflightNewsScreen to trigger auto-load - Wait for 'Load More Articles' button to appear after autoLoadCount threshold * chore(e2e-sample): Increase Maestro driver startup timeout (cherry picked from commit ee429b5) * increase timeout * Increase timeouts on Android too --------- Co-authored-by: Krystof Woldrich <[email protected]> * chore: Merge Android UI profiling on the capture startup crashes branch (#5544) * chore: Merge Android UI profiling on the capture startup crashes branch * Fix logger compilation issue * Properly check logging values * fix SR iOS issue (#5560) * Remove duplicate changelog entry * feat(expo): Add RNSentrySDK APIs support to @sentry/react-native/expo plugin (#4633) * useNativeInit Android implementation * Adds changelog * useNativeInit iOS implementation * Fix indentation * Extend test cases with realistic data * Adds code sample in the changelog * Fix CHANGELOG.md Co-authored-by: LucasZF <[email protected]> * Warn if RESentySDK.init/start wasn't injected * Make useNativeInit opt-in * Make Android failure warning more clear Co-authored-by: Krystof Woldrich <[email protected]> * Make Android no update warning more clear Co-authored-by: Krystof Woldrich <[email protected]> * Use path.basename to get last path component * Update tests to account for the new warnings * Explicitly check for kotlin * Add filename in the warning message * Import only if init injection succeeds * Explicitly check for Objective-C * Add filename in the warning * Make iOS file not found warning more clear * Import only if init injection succeeds * Reset test mock config in a function * Lint issue * Add missing quote Co-authored-by: LucasZF <[email protected]> * Remove unneeded async Co-authored-by: Krystof Woldrich <[email protected]> * Set useNativeInit = false by default * dynamically fill white spaces * Add unsupported language in warning message * Add objcpp in detected languages Co-authored-by: Krystof Woldrich <[email protected]> * Update tests for objcpp * ref(expo-plugin): Split utils to logger, version and utils (#4906) Co-authored-by: Antonis Lilis <[email protected]> * Update changelog * fix(ios): Add Swift module support for RNSentrySDK native init Fixes Swift compilation errors when using the useNativeInit Expo plugin feature. Changes: - Updated RNSentry.h to use angle bracket import for RNSentrySDK, properly exposing it through the module system - Added DEFINES_MODULE to RNSentry.podspec to enable Swift module generation - Fixed Expo plugin to insert import after first import statement (supports modern Expo AppDelegate structure without UIKit import) This enables Swift code to successfully import RNSentry and call RNSentrySDK.start() when using native initialization. Co-Authored-By: Claude Sonnet 4.5 <[email protected]> * Fix test * Update changelog * Fix native tests * Fix lint issue * Fix native tests * Revert unneeded changes * Fix sample app build --------- Co-authored-by: LucasZF <[email protected]> Co-authored-by: Krystof Woldrich <[email protected]> Co-authored-by: Claude Sonnet 4.5 <[email protected]> * Fix native ios tests * Mark area Co-authored-by: LucasZF <[email protected]> * fix(android): Fix ConcurrentModificationException (#5588) * fix(android): Fix ConcurrentModificationException when disabling native crash handling When enableNativeCrashHandling is set to false, the code was iterating over the integrations list with a for-each loop while calling remove() directly, which causes a ConcurrentModificationException at runtime. Fixed by using Java 8's removeIf() method which safely handles iteration and removal in a single operation. This is more concise and follows modern Java best practices. Added unit tests to verify the fix and ensure integrations are properly removed without throwing exceptions. Co-Authored-By: Claude Sonnet 4.5 <[email protected]> * Lint fix --------- Co-authored-by: Claude Sonnet 4.5 <[email protected]> * fix(android): Fix crash when spotlight is enabled without defaultSidecarUrl The code attempted to read defaultSidecarUrl without checking if the key exists in the options map. This caused a NoSuchKeyException crash during startup when spotlight was set to true in sentry.options.json without providing defaultSidecarUrl. Added key existence check to match iOS implementation behavior and prevent the crash while maintaining backward compatibility. Co-Authored-By: Claude Sonnet 4.5 <[email protected]> * test(e2e): Add auto init from JS tests for Android (#5583) * test(e2e): Add auto init from JS tests for Android Implements Android E2E testing infrastructure to verify both manual native initialization and auto initialization from JavaScript, matching the iOS implementation and resolving issue #4912. Key additions: - Jest configs for android.auto and android.manual test modes - Build scripts that toggle SENTRY_DISABLE_NATIVE_START at compile time - Test scripts to run auto and manual test suites separately - App start crash testing via flag file mechanism - TestControlModule to enable/disable crash-on-start from JS - Comprehensive E2E test documentation Unlike iOS which uses launch arguments at runtime, Android requires separate builds with different build configurations to control native initialization. Closes #4912 Co-Authored-By: Claude Sonnet 4.5 <[email protected]> * fix(e2e): Add scrolling to find crash control buttons in Android test The crash control buttons are off-screen, so the Maestro flow needs to scroll to find them before tapping. This matches the pattern used in other Android E2E tests. Co-Authored-By: Claude Sonnet 4.5 <[email protected]> * fix(e2e): Make Android crash flag auto-expire after one crash The crash flag file was persisting across app launches, causing the app to crash indefinitely. Now the flag auto-deletes when read, allowing: 1. First launch: Enable flag 2. Second launch: Read flag, delete it, then crash 3. Third launch: Start normally and send crash report This solves the chicken-and-egg problem where the app couldn't reach JavaScript to clear the flag because it kept crashing before JS loaded. Co-Authored-By: Claude Sonnet 4.5 <[email protected]> * fix(e2e): Handle wrapped exceptions in Android crash test Android wraps exceptions thrown in Application.onCreate() with: "Unable to create application... RuntimeException: <original message>" Updated the test to check if ANY exception in the chain contains our intentional crash message, rather than expecting an exact match on the first exception. Test now passes locally and should pass in CI. Co-Authored-By: Claude Sonnet 4.5 <[email protected]> * Clean up notes for now --------- Co-authored-by: Claude Sonnet 4.5 <[email protected]> * fix(android): Fix crash when dsn or devServerUrl are missing from options Fixes a crash on Android startup when initializing from sentry.options.json without dsn or devServerUrl fields. The code was calling getString() on ReadableMap without checking if the keys exist first, which throws NoSuchKeyException for missing keys. Both fields are optional in configuration files, so the code now checks for key existence before accessing values, returning null when keys are missing. This matches the pattern used throughout the rest of the file and is already handled correctly by the null-checks in the breadcrumb filter logic. Co-Authored-By: Claude Sonnet 4.5 <[email protected]> --------- Co-authored-by: Krystof Woldrich <[email protected]> Co-authored-by: Krystof Woldrich <[email protected]> Co-authored-by: getsentry-bot <[email protected]> Co-authored-by: getsentry-bot <[email protected]> Co-authored-by: LucasZF <[email protected]> Co-authored-by: Claude Sonnet 4.5 <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
📢 Type of change
📜 Description
Merge experimental Android UI profiling on the capture startup crashes branch
💡 Motivation and Context
Since the changed native side code caused a lot of conflicts and I needed to move things around I opened a separate PR to merge this safely.
💚 How did you test it?
Manual, CI
📝 Checklist
sendDefaultPIIis enabled🔮 Next steps
#skip-changelog