Skip to content
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

Jump to bottom

fix: Google Ads dependency conflicts #953

Merged
merged 2 commits into from
Aug 31, 2022
Merged

fix: Google Ads dependency conflicts #953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d993289
setting app lifecycle breadcrumbs to false by default
bitsandfoxes Aug 30, 2022
2299879
Updated CHANGELOG.md
bitsandfoxes Aug 31, 2022
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

### Fixes

- Fixed a crash during startup due in connection to the Google Ads Unity package ([#953](https://github.com/getsentry/sentry-unity/pull/953))
- Fixed an 'Undefined symbols' issue within the Sentry Native Bridge when building for iOS ([#932](https://github.com/getsentry/sentry-unity/pull/932))
- ANR detection no longer creates an error by trying to capture a screenshot from a background thread ([#937](https://github.com/getsentry/sentry-unity/pull/937))
- Screenshots quality no longer scales off of current resolution but tries match thresholds instead ([#939](https://github.com/getsentry/sentry-unity/pull/939))
Expand Down
5 changes: 5 additions & 0 deletions src/Sentry.Unity.Editor/Android/AndroidManifestConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ internal void ModifyManifest(string basePath)
androidManifest.SetSDK("sentry.java.android.unity");
_logger.LogDebug("Setting DSN: {0}", _options!.Dsn);
androidManifest.SetDsn(_options.Dsn!);

if (_options.Debug)
{
_logger.LogDebug("Setting Debug: {0}", _options.Debug);
Expand Down Expand Up @@ -142,6 +143,7 @@ internal void ModifyManifest(string basePath)

// Disabling the native in favor of the C# layer for now
androidManifest.SetAutoSessionTracking(false);
androidManifest.SetAutoAppLifecycleBreadcrumbs(false);
androidManifest.SetAnr(false);
// TODO: We need an opt-out for this:
androidManifest.SetNdkScopeSync(true);
Expand Down Expand Up @@ -340,6 +342,9 @@ internal void SetSampleRate(float sampleRate) =>
internal void SetAutoSessionTracking(bool enableAutoSessionTracking)
=> SetMetaData($"{SentryPrefix}.auto-session-tracking.enable", enableAutoSessionTracking.ToString());

public void SetAutoAppLifecycleBreadcrumbs(bool enableAutoAppLifeCycleBreadcrumbs)
=> SetMetaData($"{SentryPrefix}.bbreadcrumbs.app-lifecycle", enableAutoAppLifeCycleBreadcrumbs.ToString());

internal void SetAnr(bool enableAnr)
=> SetMetaData($"{SentryPrefix}.anr.enable", enableAnr.ToString());

Expand Down