Skip to content

#4018 - Safety calls to/from Android Native Serialization #4022

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jamescrosswell merged 22 commits into from
Mar 4, 2025
Merged

#4018 - Safety calls to/from Android Native Serialization #4022

Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
22ef584
#4018 - Safety calls to json serialization between native & dotnet an…
aritchie Mar 3, 2025
b32b142
Update CHANGELOG.md
aritchie Mar 3, 2025
fe5b3c0
Fix tests
aritchie Mar 3, 2025
b6071ec
Update JsonExtensionsTests.cs
aritchie Mar 3, 2025
d25e185
Update SentryEventExtensions.cs
aritchie Mar 3, 2025
f4df4c6
Update SentryEventExtensions.cs
aritchie Mar 3, 2025
a4f45e6
Format code
getsentry-bot Mar 3, 2025
3087f0d
Removing flaky exception compare for now
aritchie Mar 3, 2025
e536677
More test fixes
aritchie Mar 3, 2025
cd911ad
Format code
getsentry-bot Mar 3, 2025
9734ba2
Restore SentryUser
aritchie Mar 3, 2025
87a235a
Fix serialization
aritchie Mar 3, 2025
af339e2
Merge branch '4018-jsonelementhaswrongtype_android_breadcrumb' of htt…
aritchie Mar 3, 2025
8f2c6ae
Update SentrySdk.cs
aritchie Mar 3, 2025
5199b74
Update src/Sentry/Platforms/Android/SentrySdk.cs
aritchie Mar 4, 2025
09a9d54
Update "hack" with appropriate values
aritchie Mar 4, 2025
482c3d0
Update SentrySdk.cs
aritchie Mar 4, 2025
192cbc1
Update SentrySdk.cs
aritchie Mar 4, 2025
1aeeee3
Update SentryEventExtensions.cs
aritchie Mar 4, 2025
2983af0
Add samples for SetBeforeSend
aritchie Mar 4, 2025
17f44d4
Merge branch 'main' into 4018-jsonelementhaswrongtype_android_breadcrumb
aritchie Mar 4, 2025
9d3bc2a
Add sample
aritchie Mar 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update SentrySdk.cs
  • Loading branch information
@aritchie
aritchie committed Mar 4, 2025
commit 482c3d06ebc2a6df3154884e012cf2034e656ef8
5 changes: 3 additions & 2 deletions src/Sentry/Platforms/Android/SentrySdk.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,11 +102,12 @@

if (options.Android.SuppressSegfaults)
{
// user BeforeSend will be run by the wrapper as well if it is set
o.BeforeSend = new BeforeSendCallback(BeforeSendWrapper(options), options, o);
}
else if (options.Native.EnableBeforeSend && options.BeforeSendInternal is { } beforeSend)
else if (options.Native.EnableBeforeSend && options.BeforeSendInternal != null)
{
o.BeforeSend = beforeSend;
o.BeforeSend = options.BeforeSendInternal;

Check failure on line 110 in src/Sentry/Platforms/Android/SentrySdk.cs

View workflow job for this annotation

GitHub Actions / build 

Cannot implicitly convert type 'System.Func<Sentry.SentryEvent, Sentry.SentryHint, Sentry.SentryEvent?>' to 'Sentry.JavaSdk.SentryOptions.IBeforeSendCallback'

Check failure on line 110 in src/Sentry/Platforms/Android/SentrySdk.cs

View workflow job for this annotation

GitHub Actions / build 

Cannot implicitly convert type 'System.Func<Sentry.SentryEvent, Sentry.SentryHint, Sentry.SentryEvent?>' to 'Sentry.JavaSdk.SentryOptions.IBeforeSendCallback'

Check failure on line 110 in src/Sentry/Platforms/Android/SentrySdk.cs

View workflow job for this annotation

GitHub Actions / .NET (ubuntu-22.04) 

Cannot implicitly convert type 'System.Func<Sentry.SentryEvent, Sentry.SentryHint, Sentry.SentryEvent?>' to 'Sentry.JavaSdk.SentryOptions.IBeforeSendCallback'

Check failure on line 110 in src/Sentry/Platforms/Android/SentrySdk.cs

View workflow job for this annotation

GitHub Actions / .NET (ubuntu-22.04) 

Cannot implicitly convert type 'System.Func<Sentry.SentryEvent, Sentry.SentryHint, Sentry.SentryEvent?>' to 'Sentry.JavaSdk.SentryOptions.IBeforeSendCallback'

Check failure on line 110 in src/Sentry/Platforms/Android/SentrySdk.cs

View workflow job for this annotation

GitHub Actions / .NET (ubuntu-22.04) 

Cannot implicitly convert type 'System.Func<Sentry.SentryEvent, Sentry.SentryHint, Sentry.SentryEvent?>' to 'Sentry.JavaSdk.SentryOptions.IBeforeSendCallback'

Check failure on line 110 in src/Sentry/Platforms/Android/SentrySdk.cs

View workflow job for this annotation

GitHub Actions / .NET (ubuntu-22.04) 

Cannot implicitly convert type 'System.Func<Sentry.SentryEvent, Sentry.SentryHint, Sentry.SentryEvent?>' to 'Sentry.JavaSdk.SentryOptions.IBeforeSendCallback'

Check failure on line 110 in src/Sentry/Platforms/Android/SentrySdk.cs

View workflow job for this annotation

GitHub Actions / Analyze 

Cannot implicitly convert type 'System.Func<Sentry.SentryEvent, Sentry.SentryHint, Sentry.SentryEvent?>' to 'Sentry.JavaSdk.SentryOptions.IBeforeSendCallback'

Check failure on line 110 in src/Sentry/Platforms/Android/SentrySdk.cs

View workflow job for this annotation

GitHub Actions / Analyze 

Cannot implicitly convert type 'System.Func<Sentry.SentryEvent, Sentry.SentryHint, Sentry.SentryEvent?>' to 'Sentry.JavaSdk.SentryOptions.IBeforeSendCallback'

Check failure on line 110 in src/Sentry/Platforms/Android/SentrySdk.cs

View workflow job for this annotation

GitHub Actions / Analyze 

Cannot implicitly convert type 'System.Func<Sentry.SentryEvent, Sentry.SentryHint, Sentry.SentryEvent?>' to 'Sentry.JavaSdk.SentryOptions.IBeforeSendCallback'

Check failure on line 110 in src/Sentry/Platforms/Android/SentrySdk.cs

View workflow job for this annotation

GitHub Actions / Analyze 

Cannot implicitly convert type 'System.Func<Sentry.SentryEvent, Sentry.SentryHint, Sentry.SentryEvent?>' to 'Sentry.JavaSdk.SentryOptions.IBeforeSendCallback'

Check failure on line 110 in src/Sentry/Platforms/Android/SentrySdk.cs

View workflow job for this annotation

GitHub Actions / Trim analysis 

Cannot implicitly convert type 'System.Func<Sentry.SentryEvent, Sentry.SentryHint, Sentry.SentryEvent?>' to 'Sentry.JavaSdk.SentryOptions.IBeforeSendCallback'

Check failure on line 110 in src/Sentry/Platforms/Android/SentrySdk.cs

View workflow job for this annotation

GitHub Actions / .NET (windows-latest) 

Cannot implicitly convert type 'System.Func<Sentry.SentryEvent, Sentry.SentryHint, Sentry.SentryEvent?>' to 'Sentry.JavaSdk.SentryOptions.IBeforeSendCallback'

Check failure on line 110 in src/Sentry/Platforms/Android/SentrySdk.cs

View workflow job for this annotation

GitHub Actions / .NET (windows-latest) 

Cannot implicitly convert type 'System.Func<Sentry.SentryEvent, Sentry.SentryHint, Sentry.SentryEvent?>' to 'Sentry.JavaSdk.SentryOptions.IBeforeSendCallback'
}

// These options are from SentryAndroidOptions
Expand Down
Loading