feat: Sync file attachments to native#5211
Merged
bitsandfoxes merged 13 commits intomainfrom Mar 30, 2026
Merged
Conversation
Contributor
Semver Impact of This PR🟡 Minor (new features) 📋 Changelog PreviewThis is how your changes will appear in the changelog. New Features ✨
🤖 This preview updates automatically when you update the PR. |
Contributor
|
sentry-android-ndk/src/main/java/io/sentry/android/ndk/NdkScopeObserver.java
Show resolved
Hide resolved
…try/sentry-java into feat/sync-file-attachment
Sentry Build Distribution
|
romtsn
reviewed
Mar 20, 2026
sentry-android-ndk/src/main/java/io/sentry/android/ndk/NdkScopeObserver.java
Show resolved
Hide resolved
bitsandfoxes
commented
Mar 20, 2026
Contributor
Performance metrics 🚀
|
| Revision | Plain | With Sentry | Diff |
|---|---|---|---|
| 9ea89e8 | 308.06 ms | 358.16 ms | 50.10 ms |
| b193867 | 319.59 ms | 403.09 ms | 83.50 ms |
| dcc6bbf | 382.58 ms | 462.13 ms | 79.54 ms |
| d501a7e | 307.33 ms | 341.94 ms | 34.61 ms |
| 22f4345 | 325.23 ms | 454.66 ms | 129.43 ms |
| 33a08cc | 267.08 ms | 340.45 ms | 73.37 ms |
| dba088c | 321.78 ms | 364.59 ms | 42.82 ms |
| 092f017 | 353.13 ms | 433.84 ms | 80.71 ms |
| d501a7e | 314.55 ms | 343.34 ms | 28.79 ms |
| ce0a49e | 532.00 ms | 609.96 ms | 77.96 ms |
App size
| Revision | Plain | With Sentry | Diff |
|---|---|---|---|
| 9ea89e8 | 1.58 MiB | 2.28 MiB | 716.23 KiB |
| b193867 | 1.58 MiB | 2.19 MiB | 620.00 KiB |
| dcc6bbf | 1.58 MiB | 2.12 MiB | 553.10 KiB |
| d501a7e | 0 B | 0 B | 0 B |
| 22f4345 | 1.58 MiB | 2.29 MiB | 719.83 KiB |
| 33a08cc | 1.58 MiB | 2.12 MiB | 555.28 KiB |
| dba088c | 1.58 MiB | 2.13 MiB | 558.99 KiB |
| 092f017 | 0 B | 0 B | 0 B |
| d501a7e | 0 B | 0 B | 0 B |
| ce0a49e | 1.58 MiB | 2.10 MiB | 532.94 KiB |
There was a problem hiding this comment.
Cursor Bugbot has reviewed your changes and found 1 potential issue.
Bugbot Autofix prepared a fix for the issue found in the latest run.
- ✅ Fixed: Silent data loss for byteProvider-based attachments
- Added support for byteProvider-based attachments by invoking the callable on the background thread to resolve bytes before passing them to the native scope.
Or push these changes by commenting:
@cursor push 4e0d3a19c6
Preview (4e0d3a19c6)
diff --git a/sentry-android-ndk/src/main/java/io/sentry/android/ndk/NdkScopeObserver.java b/sentry-android-ndk/src/main/java/io/sentry/android/ndk/NdkScopeObserver.java
--- a/sentry-android-ndk/src/main/java/io/sentry/android/ndk/NdkScopeObserver.java
+++ b/sentry-android-ndk/src/main/java/io/sentry/android/ndk/NdkScopeObserver.java
@@ -170,6 +170,34 @@
return;
}
+ final java.util.concurrent.Callable<byte[]> byteProvider = attachment.getByteProvider();
+ if (byteProvider != null) {
+ final String filename = attachment.getFilename();
+ try {
+ options
+ .getExecutorService()
+ .submit(
+ () -> {
+ try {
+ final byte[] providedBytes = byteProvider.call();
+ if (providedBytes != null) {
+ nativeScope.addAttachmentBytes(providedBytes, filename);
+ }
+ } catch (Throwable e) {
+ options
+ .getLogger()
+ .log(
+ SentryLevel.ERROR,
+ e,
+ "Scope sync addAttachment failed to resolve byteProvider.");
+ }
+ });
+ } catch (Throwable e) {
+ options.getLogger().log(SentryLevel.ERROR, e, "Scope sync addAttachment has an error.");
+ }
+ return;
+ }
+
options
.getLogger()
.log(SentryLevel.DEBUG, "Scope sync addAttachment skips attachment without path or bytes.");This Bugbot Autofix run was free. To enable autofix for future PRs, go to the Cursor dashboard.
sentry-android-ndk/src/main/java/io/sentry/android/ndk/NdkScopeObserver.java
Show resolved
Hide resolved
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
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.


📜 Description
Relies on getsentry/sentry-native#1584
Attachments added to the scope should get synced to
sentry-native. I.e. a Unity games hasand the game crashes, that attachment should be available in the resulting sentry event.
💡 Motivation and Context
Resolves #4758
💚 How did you test it?
Unit tests. Unity SDK will have e2e tests.
📝 Checklist
sendDefaultPIIis enabled.🔮 Next steps
This needs to be used and implemented in the hybrid SDKs.
Adding support to sync
bytesas attachments.