Skip to content

fix: Disable Android Scope Persistence #1570

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
merged 5 commits into from
Mar 4, 2024
Merged

fix: Disable Android Scope Persistence #1570

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1d6ca3a
bump
bitsandfoxes Mar 1, 2024
68d311f
disable scope persistence
bitsandfoxes Mar 1, 2024
ca73add
Updated CHANGELOG.md
bitsandfoxes Mar 1, 2024
0f35b60
bump to 7.5.0
bitsandfoxes Mar 1, 2024
23b0e09
Updated CHANGELOG.md
bitsandfoxes Mar 1, 2024
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
10 changes: 7 additions & 3 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,15 @@

## Unreleased

### Fixes

- Fixed potential crashes on Android devices by removing the use of the persistent scope observer ([#1555](https://github.com/getsentry/sentry-unity/pull/1555))

### Dependencies

- Bump Java SDK from v7.3.0 to v7.4.0 ([#1569](https://github.com/getsentry/sentry-unity/pull/1569))
- [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#740)
- [diff](https://github.com/getsentry/sentry-java/compare/7.3.0...7.4.0)
- Bump Java SDK from v7.3.0 to v7.5.0 ([#1569](https://github.com/getsentry/sentry-unity/pull/1569), [#1555](https://github.com/getsentry/sentry-unity/pull/1555))
- [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#750)
- [diff](https://github.com/getsentry/sentry-java/compare/7.3.0...7.5.0)

## 2.0.0

Expand Down
2 changes: 1 addition & 1 deletion modules/sentry-java
Open in desktop
Submodule sentry-java updated 87 files
+20 −0 CHANGELOG.md
+1 −1 gradle.properties
+3 −1 sentry-android-core/src/main/java/io/sentry/android/core/AndroidCpuCollector.java
+3 −1 sentry-android-core/src/main/java/io/sentry/android/core/AndroidOptionsInitializer.java
+6 −0 sentry-android-core/src/main/java/io/sentry/android/core/ManifestMetadataReader.java
+11 −2 sentry-android-core/src/main/java/io/sentry/android/core/PerformanceAndroidEventProcessor.java
+1 −1 sentry-android-core/src/test/java/io/sentry/android/core/ActivityLifecycleIntegrationTest.kt
+7 −0 sentry-android-core/src/test/java/io/sentry/android/core/AndroidOptionsInitializerTest.kt
+25 −0 sentry-android-core/src/test/java/io/sentry/android/core/ManifestMetadataReaderTest.kt
+62 −0 sentry-android-core/src/test/java/io/sentry/android/core/PerformanceAndroidEventProcessorTest.kt
+5 −0 sentry-android-core/src/test/java/io/sentry/android/core/SessionTrackingIntegrationTest.kt
+4 −1 sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/MainActivity.java
+3 −0 sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/MyApplication.java
+30 −0 sentry-spring-boot-jakarta/src/main/java/io/sentry/spring/boot/jakarta/SentrySpringVersionChecker.java
+1 −0 sentry-spring-boot-jakarta/src/main/resources/META-INF/spring.factories
+12 −1 sentry-spring-boot-jakarta/src/test/kotlin/io/sentry/spring/boot/jakarta/SentryAutoConfigurationTest.kt
+30 −0 sentry-spring-boot/src/main/java/io/sentry/spring/boot/SentrySpringVersionChecker.java
+2 −0 sentry-spring-boot/src/main/resources/META-INF/spring.factories
+12 −1 sentry-spring-boot/src/test/kotlin/io/sentry/spring/boot/SentryAutoConfigurationTest.kt
+2 −1 sentry-spring-jakarta/src/main/java/io/sentry/spring/jakarta/SentryTaskDecorator.java
+2 −1 sentry-spring-jakarta/src/main/java/io/sentry/spring/jakarta/webflux/SentryScheduleHook.java
+59 −0 sentry-spring-jakarta/src/test/kotlin/io/sentry/spring/jakarta/SentryTaskDecoratorTest.kt
+60 −0 sentry-spring-jakarta/src/test/kotlin/io/sentry/spring/jakarta/webflux/SentryScheduleHookTest.kt
+2 −1 sentry-spring/src/main/java/io/sentry/spring/SentryTaskDecorator.java
+2 −1 sentry-spring/src/main/java/io/sentry/spring/webflux/SentryScheduleHook.java
+59 −0 sentry-spring/src/test/kotlin/io/sentry/spring/SentryTaskDecoratorTest.kt
+60 −0 sentry-spring/src/test/kotlin/io/sentry/spring/webflux/SentryScheduleHookTest.kt
+1 −1 sentry-test-support/api/sentry-test-support.api
+22 −6 sentry-test-support/src/main/kotlin/io/sentry/test/Mocks.kt
+229 −3 sentry/api/sentry.api
+9 −0 sentry/src/main/java/io/sentry/DefaultTransactionPerformanceCollector.java
+38 −0 sentry/src/main/java/io/sentry/ExternalOptions.java
+25 −2 sentry/src/main/java/io/sentry/Hub.java
+6 −0 sentry/src/main/java/io/sentry/HubAdapter.java
+5 −0 sentry/src/main/java/io/sentry/IHub.java
+122 −0 sentry/src/main/java/io/sentry/IMetricsAggregator.java
+4 −0 sentry/src/main/java/io/sentry/ISentryClient.java
+334 −0 sentry/src/main/java/io/sentry/MetricsAggregator.java
+8 −0 sentry/src/main/java/io/sentry/MonitorConfig.java
+9 −0 sentry/src/main/java/io/sentry/NoOpHub.java
+6 −0 sentry/src/main/java/io/sentry/NoOpSentryClient.java
+12 −1 sentry/src/main/java/io/sentry/Sentry.java
+33 −3 sentry/src/main/java/io/sentry/SentryClient.java
+23 −0 sentry/src/main/java/io/sentry/SentryEnvelopeItem.java
+1 −0 sentry/src/main/java/io/sentry/SentryItemType.java
+106 −0 sentry/src/main/java/io/sentry/SentryOptions.java
+56 −21 sentry/src/main/java/io/sentry/SentryTracer.java
+5 −4 sentry/src/main/java/io/sentry/SentryWrapper.java
+43 −6 sentry/src/main/java/io/sentry/Span.java
+30 −0 sentry/src/main/java/io/sentry/metrics/CodeLocations.java
+43 −0 sentry/src/main/java/io/sentry/metrics/CounterMetric.java
+40 −0 sentry/src/main/java/io/sentry/metrics/DistributionMetric.java
+39 −0 sentry/src/main/java/io/sentry/metrics/EncodedMetrics.java
+53 −0 sentry/src/main/java/io/sentry/metrics/GaugeMetric.java
+15 −0 sentry/src/main/java/io/sentry/metrics/IMetricsClient.java
+72 −0 sentry/src/main/java/io/sentry/metrics/Metric.java
+64 −0 sentry/src/main/java/io/sentry/metrics/MetricResourceIdentifier.java
+12 −0 sentry/src/main/java/io/sentry/metrics/MetricType.java
+533 −0 sentry/src/main/java/io/sentry/metrics/MetricsApi.java
+246 −0 sentry/src/main/java/io/sentry/metrics/MetricsHelper.java
+94 −0 sentry/src/main/java/io/sentry/metrics/NoopMetricsAggregator.java
+77 −0 sentry/src/main/java/io/sentry/metrics/SentryMetric.java
+44 −0 sentry/src/main/java/io/sentry/metrics/SetMetric.java
+23 −0 sentry/src/main/java/io/sentry/protocol/SentrySpan.java
+3 −0 sentry/src/main/java/io/sentry/protocol/SentryTransaction.java
+11 −0 sentry/src/test/java/io/sentry/ExternalOptionsTest.kt
+15 −0 sentry/src/test/java/io/sentry/HubTest.kt
+3 −0 sentry/src/test/java/io/sentry/JsonSerializerTest.kt
+387 −0 sentry/src/test/java/io/sentry/MetricsAggregatorTest.kt
+74 −0 sentry/src/test/java/io/sentry/SentryOptionsTest.kt
+19 −1 sentry/src/test/java/io/sentry/SentryTracerTest.kt
+77 −2 sentry/src/test/java/io/sentry/SentryWrapperTest.kt
+47 −0 sentry/src/test/java/io/sentry/SpanTest.kt
+83 −0 sentry/src/test/java/io/sentry/metrics/CounterMetricTest.kt
+66 −0 sentry/src/test/java/io/sentry/metrics/DistributionMetricTest.kt
+72 −0 sentry/src/test/java/io/sentry/metrics/GaugeMetricTest.kt
+212 −0 sentry/src/test/java/io/sentry/metrics/MetricsApiTest.kt
+171 −0 sentry/src/test/java/io/sentry/metrics/MetricsHelperTest.kt
+60 −0 sentry/src/test/java/io/sentry/metrics/SetMetricTest.kt
+1 −0 sentry/src/test/java/io/sentry/protocol/SentrySpanSerializationTest.kt
+2 −0 sentry/src/test/java/io/sentry/protocol/SentryTransactionSerializationTest.kt
+59 −0 sentry/src/test/java/io/sentry/util/CheckInUtilsTest.kt
+6 −0 sentry/src/test/resources/json/sentry_span.json
+6 −0 sentry/src/test/resources/json/sentry_span_legacy_date_format.json
+13 −0 sentry/src/test/resources/json/sentry_transaction.json
+13 −0 sentry/src/test/resources/json/sentry_transaction_legacy_date_format.json
+13 −0 sentry/src/test/resources/json/sentry_transaction_no_measurement_unit.json
4 changes: 4 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 @@ -164,6 +164,7 @@ internal void ModifyManifest(string basePath)
androidManifest.SetAutoSessionTracking(false);
androidManifest.SetAutoAppLifecycleBreadcrumbs(false);
androidManifest.SetAnr(false);
androidManifest.SetPersistentScopeObserver(false);

// TODO: All SentryOptions and create specific Android options

Expand Down Expand Up @@ -415,6 +416,9 @@ public void SetAutoAppLifecycleBreadcrumbs(bool enableAutoAppLifeCycleBreadcrumb
internal void SetAnr(bool enableAnr)
=> SetMetaData($"{SentryPrefix}.anr.enable", enableAnr.ToString());

internal void SetPersistentScopeObserver(bool enableScopePersistence)
=> SetMetaData($"{SentryPrefix}.enable-scope-persistence", enableScopePersistence.ToString());

internal void SetNdkEnabled(bool enableNdk)
=> SetMetaData($"{SentryPrefix}.ndk.enable", enableNdk.ToString());

Expand Down