Skip to content

Add JSON parsing/transformation for AppExitInfo #2623

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
tejasd merged 16 commits into from
May 11, 2021
Merged

Add JSON parsing/transformation for AppExitInfo #2623

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
90322b3
Add collectAnrs to FeatureSettings
tejasd Apr 13, 2021
4e186a6
Add unit test to test settings received when anr collection is enabled
tejasd Apr 13, 2021
62e8c18
Cleanup json file
tejasd Apr 13, 2021
eb08e6b
Add ability to get the startTimestampMs of a session
tejasd Apr 14, 2021
ec3e5c9
Merge branch 'crashlytics/anrs' into td/anr-2
tejasd Apr 14, 2021
c5f5f26
Change Long to long
tejasd Apr 14, 2021
4d68ae4
Merge branch 'crashlytics/anrs' into td/anr
tejasd Apr 20, 2021
0422970
Add ApplicationExitInfo to CrashlyticsReport
tejasd Apr 21, 2021
b928e3f
Comment cleanup
tejasd Apr 21, 2021
20b4f30
Revert makeEvents refactoring
tejasd Apr 21, 2021
2c8f5a9
More cleanup
tejasd Apr 21, 2021
b0f9cc4
Merge branch 'crashlytics/anrs' into td/anr
tejasd Apr 22, 2021
3452ee4
Merge branch 'crashlytics/anrs' into td/anr-2
tejasd Apr 23, 2021
d1eeea8
AppExitInfo json transform
tejasd Apr 26, 2021
490733e
Merge branch 'crashlytics/anrs' into td/anr-2
tejasd Apr 26, 2021
47511bc
Merge branch 'crashlytics/anrs' into td/anr-2
tejasd Apr 28, 2021
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
29 changes: 29 additions & 0 deletions ...firebase/crashlytics/internal/model/serialization/CrashlyticsReportJsonTransformTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,15 @@ public void testReportToJsonAndBack_with_developmentPlatform_equals() throws IOE
assertEquals(reifiedReport, testReport);
}

@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);
}

@Test
public void testEventToJsonAndBack_equals() throws IOException {
final CrashlyticsReport.Session.Event testEvent = makeTestEvent();
Expand All @@ -67,6 +76,16 @@ public void testEventToJsonAndBack_equals() throws IOException {
assertEquals(reifiedEvent, testEvent);
}

@Test
public void testAppExitInfoToJsonAndBack_equals() throws IOException {
final CrashlyticsReport.ApplicationExitInfo testAppExitInfo = makeAppExitInfo();
final String testAppExitInfoJson = transform.appExitInfoToJson(testAppExitInfo);
final CrashlyticsReport.ApplicationExitInfo reifiedAppExitInfo =
transform.applicationExitInfoFromJson(testAppExitInfoJson);
assertNotSame(reifiedAppExitInfo, testAppExitInfo);
assertEquals(reifiedAppExitInfo, testAppExitInfo);
}

private static CrashlyticsReport makeTestReport(boolean useDevelopmentPlatform) {
return CrashlyticsReport.builder()
.setSdkVersion("sdkVersion")
Expand Down Expand Up @@ -192,4 +211,14 @@ private static ImmutableList<Frame> makeTestFrames() {
.setImportance(4)
.build());
}

private static CrashlyticsReport.ApplicationExitInfo makeAppExitInfo() {
return CrashlyticsReport.ApplicationExitInfo.builder()
.setTraceFile("trace")
.setTimestamp(1L)
.setImportance(1)
.setReasonCode(1)
.setProcessName("test")
.build();
}
}
53 changes: 53 additions & 0 deletions ...gle/firebase/crashlytics/internal/model/serialization/CrashlyticsReportJsonTransform.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,12 @@ public String eventToJson(@NonNull CrashlyticsReport.Session.Event event) {
return CRASHLYTICS_REPORT_JSON_ENCODER.encode(event);
}

@NonNull
public String appExitInfoToJson(
@NonNull CrashlyticsReport.ApplicationExitInfo applicationExitInfo) {
return CRASHLYTICS_REPORT_JSON_ENCODER.encode(applicationExitInfo);
}

@NonNull
public CrashlyticsReport reportFromJson(@NonNull String json) throws IOException {
try (JsonReader jsonReader = new JsonReader(new StringReader(json))) {
Expand All @@ -65,6 +71,16 @@ public CrashlyticsReport.Session.Event eventFromJson(@NonNull String json) throw
}
}

@NonNull
public CrashlyticsReport.ApplicationExitInfo applicationExitInfoFromJson(@NonNull String json)
throws IOException {
try (JsonReader jsonReader = new JsonReader(new StringReader(json))) {
return parseAppExitInfo(jsonReader);
} catch (IllegalStateException e) {
throw new IOException(e);
}
}

@NonNull
private static CrashlyticsReport parseReport(@NonNull JsonReader jsonReader) throws IOException {
final CrashlyticsReport.Builder builder = CrashlyticsReport.builder();
Expand Down Expand Up @@ -97,6 +113,9 @@ private static CrashlyticsReport parseReport(@NonNull JsonReader jsonReader) thr
case "ndkPayload":
builder.setNdkPayload(parseNdkPayload(jsonReader));
break;
case "appExitInfo":
builder.setAppExitInfo(parseAppExitInfo(jsonReader));
break;
default:
jsonReader.skipValue();
break;
Expand Down Expand Up @@ -184,6 +203,40 @@ private static CrashlyticsReport.FilesPayload parseNdkPayload(@NonNull JsonReade
return builder.build();
}

@NonNull
private static CrashlyticsReport.ApplicationExitInfo parseAppExitInfo(
@NonNull JsonReader jsonReader) throws IOException {
final CrashlyticsReport.ApplicationExitInfo.Builder builder =
CrashlyticsReport.ApplicationExitInfo.builder();

jsonReader.beginObject();
while (jsonReader.hasNext()) {
String name = jsonReader.nextName();
switch (name) {
case "processName":
builder.setProcessName(jsonReader.nextString());
break;
case "reasonCode":
builder.setReasonCode(jsonReader.nextInt());
break;
case "importance":
builder.setImportance(jsonReader.nextInt());
break;
case "timestamp":
builder.setTimestamp(jsonReader.nextLong());
break;
case "traceFile":
builder.setTraceFile(jsonReader.nextString());
break;
default:
jsonReader.skipValue();
break;
}
}
jsonReader.endObject();
return builder.build();
}

@NonNull
private static CrashlyticsReport.FilesPayload.File parseFile(@NonNull JsonReader jsonReader)
throws IOException {
Expand Down