Refactor ApplicationExitInfo to move it to Event.Application.Execution instead of Report.

firebase-crashlytics/firebase-crashlytics.gradle

@@ -18,7 +18,10 @@ plugins {
 }
 
 firebaseLibrary {
-    testLab.enabled = true
+    testLab {
+        enabled = true
+        device 'model=flame,version=30'
+    }
 }
 
 android {

firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/CrashlyticsControllerTest.java

@@ -52,7 +52,6 @@
 import org.mockito.ArgumentCaptor;
 
 public class CrashlyticsControllerTest extends CrashlyticsTestCase {
-
   private static final String GOOGLE_APP_ID = "google:app:id";
 
   private Context testContext;

firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/CrashlyticsReportDataCaptureTest.java

@@ -20,6 +20,8 @@
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
 
+import android.app.ActivityManager;
+import android.app.ActivityManager.RunningAppProcessInfo;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.ContextWrapper;
@@ -101,6 +103,30 @@ public void testCaptureReport_containsNoDeveloperPlatformFieldsWhenUnityIsMissin
     assertNull(report.getSession().getApp().getDevelopmentPlatformVersion());
   }
 
+  @Test
+  public void testCaptureAnrEvent_foregroundAnr() {
+    CrashlyticsReport.ApplicationExitInfo testApplicationExitInfo = makeAppExitInfo(false);
+    final CrashlyticsReport.Session.Event event =
+        dataCapture.captureAnrEventData(testApplicationExitInfo);
+
+    assertEquals("anr", event.getType());
+    assertEquals(testApplicationExitInfo, event.getApp().getExecution().getAppExitInfo());
+    assertEquals(testApplicationExitInfo.getTimestamp(), event.getTimestamp());
+    assertEquals(false, event.getApp().getBackground());
+  }
+
+  @Test
+  public void testCaptureAnrEvent_backgroundAnr() {
+    CrashlyticsReport.ApplicationExitInfo testApplicationExitInfo = makeAppExitInfo(true);
+    final CrashlyticsReport.Session.Event event =
+        dataCapture.captureAnrEventData(testApplicationExitInfo);
+
+    assertEquals("anr", event.getType());
+    assertEquals(testApplicationExitInfo, event.getApp().getExecution().getAppExitInfo());
+    assertEquals(testApplicationExitInfo.getTimestamp(), event.getTimestamp());
+    assertEquals(true, event.getApp().getBackground());
+  }
+
   @Test
   public void testCaptureReportSessionFields() {
     final String sessionId = "sessionId";
@@ -369,4 +395,21 @@ public Intent registerReceiver(BroadcastReceiver receiver, IntentFilter filter)
       }
     };
   }
+
+  private static CrashlyticsReport.ApplicationExitInfo makeAppExitInfo(boolean isBackground) {
+    final int anrImportance =
+        isBackground
+            ? RunningAppProcessInfo.IMPORTANCE_CACHED
+            : ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND;
+    return CrashlyticsReport.ApplicationExitInfo.builder()
+        .setTraceFile("trace")
+        .setTimestamp(1L)
+        .setImportance(anrImportance)
+        .setReasonCode(1)
+        .setProcessName("test")
+        .setPid(1)
+        .setPss(1L)
+        .setRss(1L)
+        .build();
+  }
 }

firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/model/serialization/CrashlyticsReportJsonTransformTest.java

@@ -59,12 +59,12 @@ public void testReportToJsonAndBack_with_developmentPlatform_equals() throws IOE
   }
 
   @Test
-  public void testReportToJsonAndBack_with_appExitInfo_equals() throws IOException {
-    final CrashlyticsReport testReport = makeTestReport(false).withAppExitInfo(makeAppExitInfo());
-    final String testReportJson = transform.reportToJson(testReport);
-    final CrashlyticsReport reifiedReport = transform.reportFromJson(testReportJson);
-    assertNotSame(reifiedReport, testReport);
-    assertEquals(reifiedReport, testReport);
+  public void testAnrEventToJsonAndBack_equals() throws IOException {
+    final CrashlyticsReport.Session.Event testEvent = makeAnrEvent();
+    final String testEventJson = transform.eventToJson(testEvent);
+    final CrashlyticsReport.Session.Event reifiedEvent = transform.eventFromJson(testEventJson);
+    assertNotSame(reifiedEvent, testEvent);
+    assertEquals(reifiedEvent, testEvent);
   }
 
   @Test
@@ -180,6 +180,40 @@ private static Event makeTestEvent() {
         .build();
   }
 
+  private static Event makeAnrEvent() {
+    return Event.builder()
+        .setType("anr")
+        .setTimestamp(1000)
+        .setApp(
+            Session.Event.Application.builder()
+                .setBackground(false)
+                .setExecution(
+                    Execution.builder()
+                        .setBinaries(
+                            ImmutableList.from(
+                                Execution.BinaryImage.builder()
+                                    .setBaseAddress(0)
+                                    .setName("name")
+                                    .setSize(100000)
+                                    .setUuid("uuid")
+                                    .build()))
+                        .setSignal(Signal.builder().setCode("0").setName("0").setAddress(0).build())
+                        .setAppExitInfo(makeAppExitInfo())
+                        .build())
+                .setUiOrientation(1)
+                .build())
+        .setDevice(
+            Session.Event.Device.builder()
+                .setBatteryLevel(0.5)
+                .setBatteryVelocity(3)
+                .setDiskUsed(10000000)
+                .setOrientation(1)
+                .setProximityOn(true)
+                .setRamUsed(10000000)
+                .build())
+        .build();
+  }
+
   private static ImmutableList<Frame> makeTestFrames() {
     return ImmutableList.from(
         Frame.builder()
@@ -219,6 +253,9 @@ private static CrashlyticsReport.ApplicationExitInfo makeAppExitInfo() {
         .setImportance(1)
         .setReasonCode(1)
         .setProcessName("test")
+        .setPid(1)
+        .setPss(1L)
+        .setRss(1L)
         .build();
   }
 }

firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/persistence/CrashlyticsReportPersistenceTest.java

@@ -669,17 +669,15 @@ public void testPersistEvent_whenSettingsChanges_keepsAppropriateNumberOfMostRec
   }
 
   @Test
-  public void testPersistAppExitInfo() throws IOException {
+  public void testPersistReportWithAnrEvent() throws IOException {
     reportPersistence =
         new CrashlyticsReportPersistence(
             folder.newFolder(), getSettingsMock(VERY_LARGE_UPPER_LIMIT, 4));
     final String sessionId = "testSession";
     final CrashlyticsReport testReport = makeTestReport(sessionId);
-    final CrashlyticsReport.Session.Event testEvent1 = makeTestEvent("anr", "reason1");
-    final CrashlyticsReport.ApplicationExitInfo testAppExitInfo = makeAppExitInfo();
-
+    final Event testEvent = makeTestAnrEvent();
     reportPersistence.persistReport(testReport);
-    reportPersistence.persistAppExitInfoEvent(testEvent1, sessionId, testAppExitInfo);
+    reportPersistence.persistEvent(testEvent, sessionId, true);
 
     final long endedAt = System.currentTimeMillis();
 
@@ -690,12 +688,6 @@ public void testPersistAppExitInfo() throws IOException {
     assertEquals(1, finalizedReports.size());
     final CrashlyticsReport finalizedReport = finalizedReports.get(0).getReport();
     assertEquals(1, finalizedReport.getSession().getEvents().size());
-    assertEquals(
-        testReport
-            .withSessionEndFields(endedAt, true, null)
-            .withEvents(ImmutableList.from(testEvent1))
-            .withAppExitInfo(testAppExitInfo),
-        finalizedReport);
   }
 
   private static void persistReportWithEvent(
@@ -818,6 +810,40 @@ private static Event makeTestEvent(String type, String reason) {
         .build();
   }
 
+  private static Event makeTestAnrEvent() {
+    return Event.builder()
+        .setType("anr")
+        .setTimestamp(1000)
+        .setApp(
+            Session.Event.Application.builder()
+                .setBackground(false)
+                .setExecution(
+                    Execution.builder()
+                        .setBinaries(
+                            ImmutableList.from(
+                                Execution.BinaryImage.builder()
+                                    .setBaseAddress(0)
+                                    .setName("name")
+                                    .setSize(100000)
+                                    .setUuid("uuid")
+                                    .build()))
+                        .setSignal(Signal.builder().setCode("0").setName("0").setAddress(0).build())
+                        .setAppExitInfo(makeAppExitInfo())
+                        .build())
+                .setUiOrientation(1)
+                .build())
+        .setDevice(
+            Session.Event.Device.builder()
+                .setBatteryLevel(0.5)
+                .setBatteryVelocity(3)
+                .setDiskUsed(10000000)
+                .setOrientation(1)
+                .setProximityOn(true)
+                .setRamUsed(10000000)
+                .build())
+        .build();
+  }
+
   private static ImmutableList<Frame> makeTestFrames() {
     return ImmutableList.from(
         Frame.builder()
@@ -857,6 +883,9 @@ private static CrashlyticsReport.ApplicationExitInfo makeAppExitInfo() {
         .setImportance(1)
         .setReasonCode(1)
         .setProcessName("test")
+        .setPid(1)
+        .setPss(1L)
+        .setRss(1L)
         .build();
   }
 }

firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/CrashlyticsReportDataCapture.java

@@ -110,6 +110,20 @@ public Event captureEventData(
         .build();
   }
 
+  public Event captureAnrEventData(CrashlyticsReport.ApplicationExitInfo applicationExitInfo) {
+    // This is not the orientation of the device at the time of ANR.
+    // It's filtered out when the backend processes it.
+    // TODO: Consider setting it to 0 to mark it as unknown.
+    final int orientation = context.getResources().getConfiguration().orientation;
+
+    return Event.builder()
+        .setType("anr")
+        .setTimestamp(applicationExitInfo.getTimestamp())
+        .setApp(populateEventApplicationData(orientation, applicationExitInfo))
+        .setDevice(populateEventDeviceData(orientation))
+        .build();
+  }
+
   private CrashlyticsReport.Builder buildReportData() {
     return CrashlyticsReport.builder()
         .setSdkVersion(BuildConfig.VERSION_NAME)
@@ -212,6 +226,18 @@ private Event.Application populateEventApplicationData(
         .build();
   }
 
+  private Event.Application populateEventApplicationData(
+      int orientation, CrashlyticsReport.ApplicationExitInfo applicationExitInfo) {
+    boolean isBackground =
+        applicationExitInfo.getImportance() != RunningAppProcessInfo.IMPORTANCE_FOREGROUND;
+
+    return Event.Application.builder()
+        .setBackground(isBackground)
+        .setUiOrientation(orientation)
+        .setExecution(populateExecutionData(applicationExitInfo))
+        .build();
+  }
+
   private Event.Device populateEventDeviceData(int orientation) {
     final BatteryState battery = BatteryState.get(context);
     final Float batteryLevel = battery.getBatteryLevel();
@@ -250,6 +276,15 @@ private Execution populateExecutionData(
         .build();
   }
 
+  private Execution populateExecutionData(
+      CrashlyticsReport.ApplicationExitInfo applicationExitInfo) {
+    return Execution.builder()
+        .setAppExitInfo(applicationExitInfo)
+        .setSignal(populateSignalData())
+        .setBinaries(populateBinaryImagesList())
+        .build();
+  }
+
   private ImmutableList<Execution.Thread> populateThreadsList(
       TrimmedThrowableData trimmedEvent,
       Thread eventThread,

firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/SessionReportingCoordinator.java

@@ -55,7 +55,6 @@
 public class SessionReportingCoordinator implements CrashlyticsLifecycleEvents {
 
   private static final String EVENT_TYPE_CRASH = "crash";
-  private static final String EVENT_TYPE_ANR = "anr";
   private static final String EVENT_TYPE_LOGGED = "error";
   private static final int EVENT_THREAD_IMPORTANCE = 4;
   private static final int MAX_CHAINED_EXCEPTION_DEPTH = 8;
@@ -147,21 +146,11 @@ public void persistAppExitInfoEvent(String sessionId, ApplicationExitInfo applic
       return;
     }
 
-    // TODO: Refactor Event to only contain relevant information rather than unnecessary data like
-    // thread, exception etc.
     final CrashlyticsReport.Session.Event capturedEvent =
-        dataCapture.captureEventData(
-            new Exception("ANR"),
-            Thread.currentThread(),
-            EVENT_TYPE_ANR,
-            applicationExitInfo.getTimestamp(),
-            EVENT_THREAD_IMPORTANCE,
-            MAX_CHAINED_EXCEPTION_DEPTH,
-            false);
-    CrashlyticsReport.ApplicationExitInfo crashlyticsAppExitInfo =
-        convertApplicationExitInfo(applicationExitInfo);
+        dataCapture.captureAnrEventData(convertApplicationExitInfo(applicationExitInfo));
+
     Logger.getLogger().d("Persisting anr for session " + sessionId);
-    reportPersistence.persistAppExitInfoEvent(capturedEvent, sessionId, crashlyticsAppExitInfo);
+    reportPersistence.persistEvent(addLogsAndCustomKeysToEvent(capturedEvent), sessionId, true);
   }
 
   public void finalizeSessionWithNativeEvent(
@@ -227,28 +216,9 @@ public Task<Void> sendReports(@NonNull Executor reportSendCompleteExecutor) {
     return Tasks.whenAll(sendTasks);
   }
 
-  private void persistEvent(
-      @NonNull Throwable event,
-      @NonNull Thread thread,
-      @NonNull String sessionId,
-      @NonNull String eventType,
-      long timestamp,
-      boolean includeAllThreads) {
-
-    final boolean isHighPriority = eventType.equals(EVENT_TYPE_CRASH);
-
-    final CrashlyticsReport.Session.Event capturedEvent =
-        dataCapture.captureEventData(
-            event,
-            thread,
-            eventType,
-            timestamp,
-            EVENT_THREAD_IMPORTANCE,
-            MAX_CHAINED_EXCEPTION_DEPTH,
-            includeAllThreads);
-
+  private CrashlyticsReport.Session.Event addLogsAndCustomKeysToEvent(
+      CrashlyticsReport.Session.Event capturedEvent) {
     final CrashlyticsReport.Session.Event.Builder eventBuilder = capturedEvent.toBuilder();
-
     final String content = logFileManager.getLogString();
 
     if (content != null) {
@@ -274,7 +244,31 @@ private void persistEvent(
               .build());
     }
 
-    reportPersistence.persistEvent(eventBuilder.build(), sessionId, isHighPriority);
+    return eventBuilder.build();
+  }
+
+  private void persistEvent(
+      @NonNull Throwable event,
+      @NonNull Thread thread,
+      @NonNull String sessionId,
+      @NonNull String eventType,
+      long timestamp,
+      boolean includeAllThreads) {
+
+    final boolean isHighPriority = eventType.equals(EVENT_TYPE_CRASH);
+
+    final CrashlyticsReport.Session.Event capturedEvent =
+        dataCapture.captureEventData(
+            event,
+            thread,
+            eventType,
+            timestamp,
+            EVENT_THREAD_IMPORTANCE,
+            MAX_CHAINED_EXCEPTION_DEPTH,
+            includeAllThreads);
+
+    reportPersistence.persistEvent(
+        addLogsAndCustomKeysToEvent(capturedEvent), sessionId, isHighPriority);
   }
 
   private boolean onReportSendComplete(@NonNull Task<CrashlyticsReportWithSessionId> task) {
@@ -328,6 +322,9 @@ private static CrashlyticsReport.ApplicationExitInfo convertApplicationExitInfo(
         .setProcessName(applicationExitInfo.getProcessName())
         .setReasonCode(applicationExitInfo.getReason())
         .setTimestamp(applicationExitInfo.getTimestamp())
+        .setPid(applicationExitInfo.getPid())
+        .setPss(applicationExitInfo.getPss())
+        .setRss(applicationExitInfo.getRss())
         .setTraceFile(traceFile)
         .build();
   }