Skip to content
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

Jump to bottom

Improve minimal report app/device information #239

Merged
merged 6 commits into from
Feb 28, 2018
Merged

Improve minimal report app/device information #239

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e4b4150
detect whether a report is incomplete or not
fractalwrench Feb 5, 2018
478a330
add basic app/device info to minimal/incomplete reports
fractalwrench Feb 5, 2018
6876e7b
only override appState properties if non-null
fractalwrench Feb 5, 2018
d4ee5d0
reset appState + deviceState properties when sending minimal report
fractalwrench Feb 7, 2018
d7067b1
update to only insert objs if not nil
fractalwrench Feb 12, 2018
5ab6e12
Merge branch 'master' into improve-minimal-report
fractalwrench Feb 12, 2018
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
5 changes: 4 additions & 1 deletion Source/BugsnagCrashReport.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,10 @@ - (NSDictionary *)toJson {

NSMutableDictionary *appObj = [NSMutableDictionary new];
[appObj addEntriesFromDictionary:self.app];
[appObj addEntriesFromDictionary:self.appState];

for (NSString *key in self.appState) {
BSGDictInsertIfNotNil(appObj, self.appState[key], key);
}

if (self.dsymUUID) {
BSGDictInsertIfNotNil(appObj, @[self.dsymUUID], @"dsymUUIDs");
Expand Down
34 changes: 32 additions & 2 deletions Source/BugsnagSink.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
#import "BugsnagCollections.h"
#import "BugsnagNotifier.h"
#import "BugsnagKeys.h"
#import "BSG_KSSystemInfo.h"

// This is private in Bugsnag, but really we want package private so define
// it here.
Expand Down Expand Up @@ -59,9 +60,38 @@ - (void)filterReports:(NSArray *)reports
onCompletion:(BSG_KSCrashReportFilterCompletion)onCompletion {
NSMutableArray *bugsnagReports = [NSMutableArray new];
BugsnagConfiguration *configuration = [Bugsnag configuration];

for (NSDictionary *report in reports) {
BugsnagCrashReport *bugsnagReport =
[[BugsnagCrashReport alloc] initWithKSReport:report];
BugsnagCrashReport *bugsnagReport = [[BugsnagCrashReport alloc] initWithKSReport:report];
BOOL incompleteReport = (![@"standard" isEqualToString:[report valueForKeyPath:@"report.type"]] ||
[[report objectForKey:@"incomplete"] boolValue]);

if (incompleteReport) { // append app/device data as this is unlikely to change between sessions
NSDictionary *sysInfo = [BSG_KSSystemInfo systemInfo];

// reset any existing data as it will be corrupted/nil
bugsnagReport.appState = @{};
bugsnagReport.deviceState = @{};

bugsnagReport.app = @{
@"bundleVersion": sysInfo[@BSG_KSSystemField_BundleVersion],
@"id": sysInfo[@BSG_KSSystemField_BundleID],
@"releaseStage": configuration.releaseStage,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is a risk here for any of these values to be nil, particularly release stage if overridden by the user, so inserting values only if not nil would be prudent here as this will otherwise crash if any of these values is not set.

@"type": sysInfo[@BSG_KSSystemField_SystemName],
@"version": sysInfo[@BSG_KSSystemField_BundleShortVersion]
};

bugsnagReport.device = @{
@"jailbroken": sysInfo[@BSG_KSSystemField_Jailbroken],
@"locale": [[NSLocale currentLocale] localeIdentifier],
@"manufacturer": @"Apple",
@"model": sysInfo[@BSG_KSSystemField_Machine],
@"modelNumber": sysInfo[@BSG_KSSystemField_Model],
@"osName": sysInfo[@BSG_KSSystemField_SystemName],
@"osVersion": sysInfo[@BSG_KSSystemField_SystemVersion],
};
}

if (![bugsnagReport shouldBeSent])
continue;
BOOL shouldSend = YES;
Expand Down
2 changes: 1 addition & 1 deletion Tests/BugsnagSessionTrackingPayloadTest.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ - (void)testDeviceSerialisation {
XCTAssertNotNil(device[@"osName"]);
XCTAssertNotNil(device[@"osVersion"]);
XCTAssertEqualObjects(device[@"jailbroken"], @NO);
XCTAssertEqualObjects(device[@"wordSize"], @64);
XCTAssertNotNil(device[@"wordSize"]);
}

- (void)testAppSerialisation {
Expand Down
2 changes: 1 addition & 1 deletion Tests/BugsnagSinkTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ - (void)testEventDevice {
XCTAssertEqualObjects(device[@"jailbroken"], @YES);
XCTAssertEqualObjects(device[@"freeMemory"], @742920192);
XCTAssertEqualObjects(device[@"orientation"], @"unknown");
XCTAssertEqualObjects(device[@"wordSize"], @64);
XCTAssertNotNil(device[@"wordSize"]);
}

- (void)testEventApp {
Expand Down
6 changes: 3 additions & 3 deletions examples/objective-c-ios/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PODS:
- Bugsnag (5.15.0)
- Bugsnag (5.15.3)

DEPENDENCIES:
- Bugsnag (from `../..`)
Expand All @@ -9,8 +9,8 @@ EXTERNAL SOURCES:
:path: ../..

SPEC CHECKSUMS:
Bugsnag: d7958a4628b967d395a09f650732a234ee7de8c9
Bugsnag: 49464c6c2fb7a2eb5a66064586c64a6e23454c04

PODFILE CHECKSUM: 4c48f26cc704429f747c4af7a40e026b20fdc83e

COCOAPODS: 1.3.1
COCOAPODS: 1.4.0