Skip to content

Commit 125b0c4

Browse files
committed
convert AnrV2EventProcessor to a more generic ApplicationExitInfoEventProcessor
this handles all events with Backfillable hint, but adds an interface HintEnricher, to allow hint-specific enrichment (like for ANRs) before and after the generic backfilling happened.
1 parent c8acdf9 commit 125b0c4

File tree

6 files changed

+203
-121
lines changed

6 files changed

+203
-121
lines changed

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -129,13 +129,6 @@ public final class io/sentry/android/core/AnrIntegrationFactory {
129129
public static fun create (Landroid/content/Context;Lio/sentry/android/core/BuildInfoProvider;)Lio/sentry/Integration;
130130
}
131131

132-
public final class io/sentry/android/core/AnrV2EventProcessor : io/sentry/BackfillingEventProcessor {
133-
public fun <init> (Landroid/content/Context;Lio/sentry/android/core/SentryAndroidOptions;Lio/sentry/android/core/BuildInfoProvider;)V
134-
public fun getOrder ()Ljava/lang/Long;
135-
public fun process (Lio/sentry/SentryEvent;Lio/sentry/Hint;)Lio/sentry/SentryEvent;
136-
public fun process (Lio/sentry/protocol/SentryTransaction;Lio/sentry/Hint;)Lio/sentry/protocol/SentryTransaction;
137-
}
138-
139132
public class io/sentry/android/core/AnrV2Integration : io/sentry/Integration, java/io/Closeable {
140133
public fun <init> (Landroid/content/Context;)V
141134
public fun close ()V
@@ -191,6 +184,13 @@ public final class io/sentry/android/core/AppState$LifecycleObserver : androidx/
191184
public fun onStop (Landroidx/lifecycle/LifecycleOwner;)V
192185
}
193186

187+
public final class io/sentry/android/core/ApplicationExitInfoEventProcessor : io/sentry/BackfillingEventProcessor {
188+
public fun <init> (Landroid/content/Context;Lio/sentry/android/core/SentryAndroidOptions;Lio/sentry/android/core/BuildInfoProvider;)V
189+
public fun getOrder ()Ljava/lang/Long;
190+
public fun process (Lio/sentry/SentryEvent;Lio/sentry/Hint;)Lio/sentry/SentryEvent;
191+
public fun process (Lio/sentry/protocol/SentryTransaction;Lio/sentry/Hint;)Lio/sentry/protocol/SentryTransaction;
192+
}
193+
194194
public final class io/sentry/android/core/BuildConfig {
195195
public static final field BUILD_TYPE Ljava/lang/String;
196196
public static final field DEBUG Z

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -188,10 +188,8 @@ static void initializeIntegrationsAndProcessors(
188188
options.addEventProcessor(new PerformanceAndroidEventProcessor(options, activityFramesTracker));
189189
options.addEventProcessor(new ScreenshotEventProcessor(options, buildInfoProvider));
190190
options.addEventProcessor(new ViewHierarchyEventProcessor(options));
191-
options.addEventProcessor(new AnrV2EventProcessor(context, options, buildInfoProvider));
192-
if (buildInfoProvider.getSdkInfoVersion() >= Build.VERSION_CODES.S) {
193-
options.addEventProcessor(new TombstoneEventProcessor(context, options, buildInfoProvider));
194-
}
191+
options.addEventProcessor(
192+
new ApplicationExitInfoEventProcessor(context, options, buildInfoProvider));
195193
if (options.getTransportGate() instanceof NoOpTransportGate) {
196194
options.setTransportGate(new AndroidTransportGate(options));
197195
}

0 commit comments

Comments
 (0)