Skip to content

Read new settings values for heap dumps; decorate events #8549

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

Open
kmandrika wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Read new settings values for heap dumps; decorate events #8549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 22 additions & 0 deletions firebase-crashlytics/src/androidTest/assets/firebase_settings_heap_dumps.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"settings_version": 3,
"cache_duration": 7200,
"features": {
"collect_logged_exceptions": true,
"collect_reports": true
},
"app": {
"status": "activated",
"report_upload_variant": 2,
"native_report_upload_variant": 2,
"update_required": true
},
"fabric": {
"app_id": "abcd12345abcde12345abcde",
"org_id": "12345abcde12345abcde1234",
"bundle_id": "com.google.firebase.crashlytics.sdk.test"
},
"profiling": {
"heap_dump_collection_enabled": true
}
}
73 changes: 21 additions & 52 deletions ...dTest/java/com/google/firebase/crashlytics/internal/common/CrashlyticsControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
import android.content.Context;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.os.ProfilingTrigger;
import androidx.test.filters.SdkSuppress;
import com.google.android.gms.tasks.Task;
import com.google.android.gms.tasks.TaskCompletionSource;
Expand All @@ -55,6 +54,7 @@
import com.google.firebase.crashlytics.internal.settings.TestSettings;
import com.google.firebase.installations.FirebaseInstallationsApi;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
Expand All @@ -63,7 +63,6 @@
import java.util.TreeSet;
import java.util.concurrent.Executor;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
Expand Down Expand Up @@ -573,66 +572,36 @@ public void testUploadDisabledThenEnabled() throws Exception {

@SdkSuppress(minSdkVersion = 37) // ProfilingManager
@Test
public void testWritingProfilingManagerTriggerAnomaly() {
public void testWritingProfilingManagerTriggerHeapDumpEnabledMarker() {
LogFileManager logFileManager = new LogFileManager(testFileStore);
CrashlyticsController controller = builder().setLogFileManager(logFileManager).build();

controller.writeTriggerTypeFile("sessionId", ProfilingTrigger.TRIGGER_TYPE_ANOMALY);

List<Integer> triggers =
testFileStore
.getSessionFiles(
"sessionId",
(dir, name) -> List.of("trigger-type-anomaly", "trigger-type-oom").contains(name))
.stream()
.map(
triggerFile -> {
switch (triggerFile.getName()) {
case "trigger-type-anomaly":
return ProfilingTrigger.TRIGGER_TYPE_ANOMALY;
case "trigger-type-oom":
return ProfilingTrigger.TRIGGER_TYPE_OOM;
}

return ProfilingTrigger.TRIGGER_TYPE_NONE;
})
.filter(trigger -> trigger != ProfilingTrigger.TRIGGER_TYPE_NONE)
.collect(Collectors.toList());

assertFalse(triggers.isEmpty());
assertEquals(triggers, List.of(ProfilingTrigger.TRIGGER_TYPE_ANOMALY));
controller.writeTriggerHeapDumpCollectionEnabledMarker("sessionId", true);

List<File> markers =
testFileStore.getSessionFiles(
"sessionId", (dir, name) -> name.contains("trigger-heap-dump-collection-enabled"));

assertFalse(markers.isEmpty());
assertEquals(1, markers.size());
assertEquals("trigger-heap-dump-collection-enabled", markers.get(0).getName());
}

@SdkSuppress(minSdkVersion = 37) // ProfilingTrigger
@Test
public void testWritingProfilingManagerTriggerOom() {
public void testWritingProfilingManagerTriggerHeapDumpMarker() throws IOException {
LogFileManager logFileManager = new LogFileManager(testFileStore);
CrashlyticsController controller = builder().setLogFileManager(logFileManager).build();

controller.writeTriggerTypeFile("sessionId", ProfilingTrigger.TRIGGER_TYPE_OOM);

List<Integer> triggers =
testFileStore
.getSessionFiles(
"sessionId",
(dir, name) -> List.of("trigger-type-anomaly", "trigger-type-oom").contains(name))
.stream()
.map(
triggerFile -> {
switch (triggerFile.getName()) {
case "trigger-type-anomaly":
return ProfilingTrigger.TRIGGER_TYPE_ANOMALY;
case "trigger-type-oom":
return ProfilingTrigger.TRIGGER_TYPE_OOM;
}

return ProfilingTrigger.TRIGGER_TYPE_NONE;
})
.filter(trigger -> trigger != ProfilingTrigger.TRIGGER_TYPE_NONE)
.collect(Collectors.toList());

assertFalse(triggers.isEmpty());
assertEquals(triggers, List.of(ProfilingTrigger.TRIGGER_TYPE_OOM));
controller.writeTriggerHeapDumpGeneratedMarker("sessionId", "path/to/heap");

List<File> markers =
testFileStore.getSessionFiles(
"sessionId", (dir, name) -> name.contains("trigger-heap-dump-generated"));

assertFalse(markers.isEmpty());
assertEquals(1, markers.size());
assertEquals("trigger-heap-dump-generated", markers.get(0).getName());
}

@SdkSuppress(minSdkVersion = 30) // ApplicationExitInfo
Expand Down
63 changes: 62 additions & 1 deletion ...java/com/google/firebase/crashlytics/internal/common/SessionReportingCoordinatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,11 @@
import static org.mockito.Mockito.when;

import android.app.ApplicationExitInfo;
import android.content.Context;
import android.os.Parcel;
import android.system.OsConstants;
import androidx.test.filters.SdkSuppress;
import androidx.test.platform.app.InstrumentationRegistry;
import com.google.android.gms.tasks.Task;
import com.google.android.gms.tasks.Tasks;
import com.google.firebase.concurrent.TestOnlyExecutors;
Expand All @@ -50,6 +52,7 @@
import com.google.firebase.crashlytics.internal.persistence.FileStore;
import com.google.firebase.crashlytics.internal.send.DataTransportCrashlyticsReportSender;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
Expand Down Expand Up @@ -652,7 +655,65 @@ public void testIsOom_returnTrueOnReasonLowMemory() {
assertTrue(isOom);
}

@SdkSuppress(minSdkVersion = 37)
@Test
public void testIsMemoryLimiterKill() {
ApplicationExitInfo mlk =
makeApplicationExitInfo(ApplicationExitInfo.REASON_OTHER, 0, 0, "MemoryLimiter:AnonSwap");

boolean isMlk = reportingCoordinator.isMemoryLimiterKill("sessionId", List.of(mlk));

assertTrue(isMlk);
}

@SdkSuppress(minSdkVersion = 37)
@Test
public void testWasHeapDumpGeneratedViaFile_returnsTrueForCorrectSessionTime()
throws IOException {
Context context = InstrumentationRegistry.getInstrumentation().getTargetContext();

File profilingDir = new File(context.getFilesDir(), "profiling");
assertTrue(profilingDir.mkdir());

File heapDump =
new File(context.getFilesDir(), "profiling/com.google.firebase.crashlytics.test.hprof");
assertTrue(heapDump.createNewFile());

long sessionTime = heapDump.lastModified();

boolean generated =
SessionReportingCoordinator.wasHeapDumpGeneratedViaFile(context.getFilesDir(), sessionTime);

assertTrue(generated);
}

@SdkSuppress(minSdkVersion = 37)
@Test
public void testWasHeapDumpGeneratedViaFile_returnsFalseForIncorrectSessionTime()
throws IOException {
Context context = InstrumentationRegistry.getInstrumentation().getTargetContext();

File profilingDir = new File(context.getFilesDir(), "profiling");
assertTrue(profilingDir.mkdir());

File heapDump =
new File(context.getFilesDir(), "profiling/com.google.firebase.crashlytics.test.hprof");
assertTrue(heapDump.createNewFile());

long sessionTime = heapDump.lastModified() + 100;

boolean generated =
SessionReportingCoordinator.wasHeapDumpGeneratedViaFile(context.getFilesDir(), sessionTime);

assertFalse(generated);
}

private ApplicationExitInfo makeApplicationExitInfo(int reason, int subreason, int status) {
return makeApplicationExitInfo(reason, subreason, status, "");
}

private ApplicationExitInfo makeApplicationExitInfo(
int reason, int subreason, int status, String description) {
Parcel dest = Parcel.obtain();

dest.writeInt(1);
Expand All @@ -669,7 +730,7 @@ private ApplicationExitInfo makeApplicationExitInfo(int reason, int subreason, i
dest.writeLong(1L);
dest.writeLong(1L);
dest.writeLong(1L);
dest.writeString("");
dest.writeString(description);
dest.writeByteArray(new byte[] {});
dest.setDataPosition(0);

Expand Down
Loading
Loading