Skip to content

Commit 1e2deda

Browse files
supervacuussupervacuus
authored
Merge c3be389 into 8687935 
2 parents 8687935 + c3be389 commit 1e2deda

23 files changed

+1024
-15
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
.DS_Store
2+
.java-version
23
.idea/
34
.gradle/
45
.run/

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
- Add `installGroupsOverride` parameter and `installGroups` property to Build Distribution SDK ([#5062](https://github.com/getsentry/sentry-java/pull/5062))
88
- Update Android targetSdk to API 36 (Android 16) ([#5016](https://github.com/getsentry/sentry-java/pull/5016))
9+
- Merge Tombstone and Native SDK events into single crash event. ([#5037](https://github.com/getsentry/sentry-java/pull/5037))
910
- Add AndroidManifest support for Spotlight configuration via `io.sentry.spotlight.enable` and `io.sentry.spotlight.url` ([#5064](https://github.com/getsentry/sentry-java/pull/5064))
1011

1112
### Fixes

‎sentry-android-core/api/sentry-android-core.api‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,6 +291,19 @@ public final class io/sentry/android/core/LoadClass : io/sentry/util/LoadClass {
291291
public fun loadClass (Ljava/lang/String;Lio/sentry/ILogger;)Ljava/lang/Class;
292292
}
293293

294+
public final class io/sentry/android/core/NativeEventCollector {
295+
public fun <init> (Lio/sentry/android/core/SentryAndroidOptions;)V
296+
public fun collect ()V
297+
public fun deleteNativeEventFile (Lio/sentry/android/core/NativeEventCollector$NativeEventData;)Z
298+
public fun findAndRemoveMatchingNativeEvent (J)Lio/sentry/android/core/NativeEventCollector$NativeEventData;
299+
}
300+
301+
public final class io/sentry/android/core/NativeEventCollector$NativeEventData {
302+
public fun getEnvelope ()Lio/sentry/SentryEnvelope;
303+
public fun getEvent ()Lio/sentry/SentryEvent;
304+
public fun getFile ()Ljava/io/File;
305+
}
306+
294307
public final class io/sentry/android/core/NdkHandlerStrategy : java/lang/Enum {
295308
public static final field SENTRY_HANDLER_STRATEGY_CHAIN_AT_START Lio/sentry/android/core/NdkHandlerStrategy;
296309
public static final field SENTRY_HANDLER_STRATEGY_DEFAULT Lio/sentry/android/core/NdkHandlerStrategy;
@@ -500,7 +513,7 @@ public final class io/sentry/android/core/TombstoneIntegration$TombstoneHint : i
500513
}
501514

502515
public class io/sentry/android/core/TombstoneIntegration$TombstonePolicy : io/sentry/android/core/ApplicationExitInfoHistoryDispatcher$ApplicationExitInfoPolicy {
503-
public fun <init> (Lio/sentry/android/core/SentryAndroidOptions;)V
516+
public fun <init> (Lio/sentry/android/core/SentryAndroidOptions;Landroid/content/Context;)V
504517
public fun buildReport (Landroid/app/ApplicationExitInfo;Z)Lio/sentry/android/core/ApplicationExitInfoHistoryDispatcher$Report;
505518
public fun getLabel ()Ljava/lang/String;
506519
public fun getLastReportedTimestamp ()Ljava/lang/Long;

‎sentry-android-core/src/main/java/io/sentry/android/core/AndroidOptionsInitializer.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,7 @@ static void initializeIntegrationsAndProcessors(
244244
if (options.getSocketTagger() instanceof NoOpSocketTagger) {
245245
options.setSocketTagger(AndroidSocketTagger.getInstance());
246246
}
247+
247248
if (options.getPerformanceCollectors().isEmpty()) {
248249
options.addPerformanceCollector(new AndroidMemoryCollector());
249250
options.addPerformanceCollector(new AndroidCpuCollector(options.getLogger()));

‎sentry-android-core/src/main/java/io/sentry/android/core/ManifestMetadataReader.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ final class ManifestMetadataReader {
3434
static final String ANR_TIMEOUT_INTERVAL_MILLIS = "io.sentry.anr.timeout-interval-millis";
3535
static final String ANR_ATTACH_THREAD_DUMPS = "io.sentry.anr.attach-thread-dumps";
3636

37+
static final String TOMBSTONE_ENABLE = "io.sentry.tombstone.enable";
38+
3739
static final String AUTO_INIT = "io.sentry.auto-init";
3840
static final String NDK_ENABLE = "io.sentry.ndk.enable";
3941
static final String NDK_SCOPE_SYNC_ENABLE = "io.sentry.ndk.scope-sync.enable";
@@ -205,6 +207,8 @@ static void applyMetadata(
205207
}
206208

207209
options.setAnrEnabled(readBool(metadata, logger, ANR_ENABLE, options.isAnrEnabled()));
210+
options.setTombstoneEnabled(
211+
readBool(metadata, logger, TOMBSTONE_ENABLE, options.isTombstoneEnabled()));
208212

209213
// use enableAutoSessionTracking as fallback
210214
options.setEnableAutoSessionTracking(

0 commit comments

Comments
 (0)