Don't calculate free disk space since it requires grey APIs

Bugsnag/KSCrash/Source/KSCrash/Recording/BSG_KSCrashReport.c

@@ -460,8 +460,7 @@ void bsg_kscrw_i_writeTraceInfo(const BSG_KSCrash_Context *crashContext,
 bool bsg_kscrw_i_exceedsBufferLen(const size_t length);
 
 void bsg_kscrashreport_writeKSCrashFields(BSG_KSCrash_Context *crashContext,
-                                          BSG_KSCrashReportWriter *writer,
-                                          const char *const path);
+                                          BSG_KSCrashReportWriter *writer);
 
 #pragma mark Backtrace
 
@@ -869,21 +868,6 @@ void bsg_kscrw_i_writeMemoryInfo(const BSG_KSCrashReportWriter *const writer,
     writer->endContainer(writer);
 }
 
-void bsg_kscrw_i_writeDiskInfo(const BSG_KSCrashReportWriter *const writer,
-                               const char *const key,
-                               const char *const path) {
-    uint64_t freeDisk, size;
-    if (!bsg_ksfuStatfs(path, &freeDisk, &size)) {
-        return;
-    }
-    writer->beginObject(writer, key);
-    {
-        bsg_kscrw_i_addUIntegerElement(writer, BSG_KSCrashField_Free, freeDisk);
-        bsg_kscrw_i_addUIntegerElement(writer, BSG_KSCrashField_Size, size);
-    }
-    writer->endContainer(writer);
-}
-
 /** Write information about the error leading to the crash to the report.
  *
  * @param writer The writer.
@@ -1261,7 +1245,7 @@ void bsg_kscrashreport_writeStandardReport(
                 writer, BSG_KSCrashField_Report, BSG_KSCrashReportType_Standard,
                 crashContext->config.crashID, crashContext->config.processName);
 
-        bsg_kscrashreport_writeKSCrashFields(crashContext, writer, path);
+        bsg_kscrashreport_writeKSCrashFields(crashContext, writer);
 
         if (crashContext->config.onCrashNotify != NULL) {
             // NOTE: The deny list for BSG_KSCrashField_UserAtCrash children in BugsnagEvent.m
@@ -1282,8 +1266,7 @@ void bsg_kscrashreport_writeStandardReport(
 }
 
 void bsg_kscrashreport_writeKSCrashFields(BSG_KSCrash_Context *crashContext,
-                                          BSG_KSCrashReportWriter *writer,
-                                          const char *const path) {
+                                          BSG_KSCrashReportWriter *writer) {
 
     bsg_kscrw_i_writeProcessState(writer, BSG_KSCrashField_ProcessState);
 
@@ -1298,7 +1281,6 @@ void bsg_kscrashreport_writeKSCrashFields(BSG_KSCrash_Context *crashContext,
         bsg_kscrw_i_writeMemoryInfo(writer, BSG_KSCrashField_Memory);
         bsg_kscrw_i_writeAppStats(writer, BSG_KSCrashField_AppStats,
                 &crashContext->state);
-        bsg_kscrw_i_writeDiskInfo(writer, BSG_KSCrashField_Disk, path);
     }
     writer->endContainer(writer);
 

Bugsnag/KSCrash/Source/KSCrash/Recording/BSG_KSSystemInfo.m

@@ -381,19 +381,6 @@ + (NSDictionary *)systemInfo {
         @BSG_KSCrashField_Size: @(NSProcessInfo.processInfo.physicalMemory)
     };
 
-    NSString *dir = NSSearchPathForDirectoriesInDomains(
-        NSCachesDirectory, NSUserDomainMask, YES).firstObject;
-    const char *path = dir.fileSystemRepresentation;
-    if (path) {
-        uint64_t dfree, size;
-        if (bsg_ksfuStatfs(path, &dfree, &size)) {
-            sysInfo[@BSG_KSSystemField_Disk] = @{
-                @ BSG_KSCrashField_Free: @(dfree),
-                @ BSG_KSCrashField_Size: @(size)
-            };
-        }
-    }
-
     bsg_kscrashstate_updateDurationStats();
     BSG_KSCrash_State state = crashContext()->state;
     NSMutableDictionary *statsInfo = [NSMutableDictionary dictionary];

Bugsnag/KSCrash/Source/KSCrash/Recording/Tools/BSG_KSFileUtils.c

@@ -82,13 +82,3 @@ bool bsg_ksfuwriteBytesToFD(const int fd, const char *const bytes,
 
     return true;
 }
-
-bool bsg_ksfuStatfs(const char *path, uint64_t *free, uint64_t *total) {
-    struct statfs st;
-    if (statfs(path, &st) != 0) {
-        return false;
-    }
-    *free = st.f_bsize * st.f_bavail;
-    *total = st.f_bsize * st.f_blocks;
-    return true;
-}

Bugsnag/KSCrash/Source/KSCrash/Recording/Tools/BSG_KSFileUtils.h

@@ -65,18 +65,6 @@ bool bsg_ksfuwriteBytesToFD(const int fd, const char *bytes, ssize_t length);
  */
 bool bsg_ksfuflushWriteBuffer(const int fd);
 
-/**
- * Get file system statistics.
- *
- * @param path  The path name of any file or directory within the file system.
- * @param free  A pointer to where the number of free bytes availalable to a
- *              non-superuser (corresponding to NSFileSystemFreeSize) should be
- *              written.
- * @param total A pointer to where the total number of bytes in the file system
- *              should be written.
- */
-bool bsg_ksfuStatfs(const char *path, uint64_t *free, uint64_t *total);
-
 #ifdef __cplusplus
 }
 #endif

Bugsnag/Payload/BugsnagDeviceWithState.m

@@ -56,7 +56,6 @@ + (BugsnagDeviceWithState *) deviceFromJson:(NSDictionary *)json {
     BugsnagDeviceWithState *device = [BugsnagDeviceWithState new];
     device.id = json[@"id"];
     device.freeMemory = json[@"freeMemory"];
-    device.freeDisk = json[@"freeDisk"];
     device.locale = json[@"locale"];
     device.manufacturer = json[@"manufacturer"];
     device.model = json[@"model"];
@@ -84,7 +83,6 @@ + (BugsnagDeviceWithState *)deviceWithKSCrashReport:(NSDictionary *)event {
     [self populateFields:device dictionary:event];
     device.orientation = [event valueForKeyPath:@"user.state.deviceState.orientation"];
     device.freeMemory = [event valueForKeyPath:@"system." BSG_KSSystemField_Memory "." BSG_KSCrashField_Free];
-    device.freeDisk = [event valueForKeyPath:@"system." BSG_KSSystemField_Disk "." BSG_KSCrashField_Free];
 
     NSString *val = [event valueForKeyPath:@"report.timestamp"];
 
@@ -103,7 +101,6 @@ + (BugsnagDeviceWithState *)deviceWithKSCrashReport:(NSDictionary *)event {
 
 - (NSDictionary *)toDictionary {
     NSMutableDictionary *dict = [[super toDictionary] mutableCopy];
-    dict[@"freeDisk"] = self.freeDisk;
     dict[@"freeMemory"] = self.freeMemory;
     dict[@"orientation"] = self.orientation;
     dict[@"time"] = self.time ? [BSG_RFC3339DateTool stringFromDate:self.time] : nil;

Bugsnag/include/Bugsnag/BugsnagDeviceWithState.h

@@ -18,11 +18,6 @@
 BUGSNAG_EXTERN
 @interface BugsnagDeviceWithState : BugsnagDevice
 
-/**
- * The number of free bytes of storage available on the device
- */
-@property (strong, nullable, nonatomic) NSNumber *freeDisk;
-
 /**
  * The number of free bytes of memory available on the device
  */

Gemfile.lock

@@ -160,6 +160,8 @@ GEM
     nanaimo (0.3.0)
     nap (1.1.0)
     netrc (0.11.0)
+    nokogiri (1.15.5-arm64-darwin)
+      racc (~> 1.4)
     nokogiri (1.15.5-x86_64-darwin)
       racc (~> 1.4)
     optimist (3.0.1)
@@ -208,6 +210,7 @@ GEM
       rexml (~> 3.2.4)
 
 PLATFORMS
+  arm64-darwin-22
   x86_64-darwin-19
 
 DEPENDENCIES

Tests/BugsnagTests/BugsnagClientPayloadInfoTest.m

@@ -48,7 +48,6 @@ - (void)testAppInfo {
 - (void)testDeviceInfo {
     BugsnagClient *client = [Bugsnag client];
     NSDictionary *device = [[client generateDeviceWithState:BSGGetSystemInfo()] toDictionary];
-    XCTAssertNotNil(device[@"freeDisk"]);
     XCTAssertNotNil(device[@"freeMemory"]);
     XCTAssertNotNil(device[@"id"]);
     XCTAssertNotNil(device[@"jailbroken"]);

Tests/BugsnagTests/BugsnagDeviceTest.m

@@ -91,7 +91,6 @@ - (void)testDeviceWithState {
     XCTAssertEqualObjects(runtimeVersions, device.runtimeVersions);
 
     // verify stateful fields
-    XCTAssertGreaterThan(device.freeDisk.longLongValue, 0);
     XCTAssertEqualObjects(@742920192, device.freeMemory);
     XCTAssertEqualObjects(@"portrait", device.orientation);
 
@@ -153,7 +152,6 @@ - (void)testDeviceWithStateToDict {
 
     // verify stateless fields
     XCTAssertEqualObjects(@"portrait", dict[@"orientation"]);
-    XCTAssertTrue(dict[@"freeDisk"] > 0);
     XCTAssertEqualObjects(@742920192, dict[@"freeMemory"]);
 
     NSDateFormatter *formatter = [NSDateFormatter new];
@@ -190,7 +188,6 @@ - (void)testDeviceFromJson {
                     @"osBuild": @"14B25",
                     @"clangVersion": @"10.0.0 (clang-1000.11.45.5)"
             },
-            @"freeDisk": @509234098,
             @"freeMemory": @742920192,
             @"orientation": @"portrait",
             @"time": @"2014-12-02T01:56:13Z"
@@ -215,7 +212,6 @@ - (void)testDeviceFromJson {
     XCTAssertEqualObjects(runtimeVersions, device.runtimeVersions);
 
     // verify stateful fields
-    XCTAssertEqualObjects(@509234098, device.freeDisk);
     XCTAssertEqualObjects(@742920192, device.freeMemory);
     XCTAssertEqualObjects(@"portrait", device.orientation);
 

Tests/BugsnagTests/BugsnagEventPersistLoadTest.m

@@ -135,7 +135,6 @@ - (void)testAppFieldsOverride {
 - (void)testDeviceFieldsOverride {
     BugsnagEvent *event = [self generateEventWithOverrides:@{
             @"device": @{
-                    @"freeDisk": @920234094,
                     @"freeMemory": @5092340923,
                     @"totalMemory": @92092340923,
                     @"orientation": @"landscape",
@@ -159,7 +158,6 @@ - (void)testDeviceFieldsOverride {
     formatter.timeZone = [NSTimeZone timeZoneForSecondsFromGMT:0];
 
     BugsnagDeviceWithState *device = event.device;
-    XCTAssertEqualObjects(@920234094, device.freeDisk);
     XCTAssertEqualObjects(@5092340923, device.freeMemory);
     XCTAssertEqualObjects(@92092340923, device.totalMemory);
     XCTAssertEqualObjects(@"landscape", device.orientation);

Tests/BugsnagTests/BugsnagSwiftPublicAPITests.swift

@@ -329,13 +329,6 @@ class BugsnagSwiftPublicAPITests: BSGTestCase {
 
         // withState
 
-        device.freeDisk = nil
-        device.freeDisk = 0
-        device.freeDisk = 1.1
-        device.freeDisk = -45
-        device.freeDisk = NSNumber(booleanLiteral: true)
-        _ = device.freeDisk
-
         device.freeMemory = nil
         device.freeMemory = 0
         device.freeMemory = 1.1

Tests/BugsnagTests/EventApiValidationTest.m

@@ -141,11 +141,6 @@ - (void)testValidDevice {
     BugsnagDeviceWithState *device = self.event.device;
     XCTAssertNotNil(device);
 
-    device.freeDisk = nil;
-    XCTAssertNil(device.freeDisk);
-    device.freeDisk = @20983409;
-    XCTAssertEqualObjects(@20983409, device.freeDisk);
-
     device.freeMemory = nil;
     XCTAssertNil(device.freeMemory);
     device.freeMemory = @509234092;

features/app_and_device_attributes.feature

@@ -30,7 +30,6 @@ Feature: App and Device attributes present
 
     # DeviceWithState
 
-    And the error payload field "events.0.device.freeDisk" is an integer
     And the error payload field "events.0.device.freeMemory" is an integer
     And on iOS, the event "device.orientation" matches "(face(down|up)|landscape(left|right)|portrait(upsidedown)?)"
     And the error payload field "events.0.device.time" is a date

features/app_hangs.feature

@@ -56,7 +56,6 @@ Feature: App hangs
 
     # DeviceWithState
 
-    And the error payload field "events.0.device.freeDisk" is an integer
     And the error payload field "events.0.device.freeMemory" is an integer
     And on iOS, the event "device.orientation" matches "(face(down|up)|landscape(left|right)|portrait(upsidedown)?)"
     And the error payload field "events.0.device.time" is a date

features/barebone_tests.feature

@@ -108,7 +108,6 @@ Feature: Barebone tests
     And the error payload field "events.0.app.dsymUUIDs" is a non-empty array
     And the error payload field "events.0.app.duration" is a number
     And the error payload field "events.0.app.durationInForeground" is a number
-    And the error payload field "events.0.device.freeDisk" is an integer
     And the error payload field "events.0.device.freeMemory" is an integer
     And the error payload field "events.0.device.model" matches the regex "[iPad|Macmini|iPhone]1?\d,\d"
     And the error payload field "events.0.device.totalMemory" is an integer
@@ -232,7 +231,6 @@ Feature: Barebone tests
     And the error payload field "events.0.app.dsymUUIDs" is a non-empty array
     And the error payload field "events.0.app.duration" is a number
     And the error payload field "events.0.app.durationInForeground" is a number
-    And the error payload field "events.0.device.freeDisk" is an integer
     And the error payload field "events.0.device.freeMemory" is an integer
     And the error payload field "events.0.device.model" matches the regex "[iPad|Macmini|iPhone]1?\d,\d"
     And the error payload field "events.0.device.totalMemory" is an integer
@@ -335,6 +333,5 @@ Feature: Barebone tests
     And the error payload field "events.0.app.dsymUUIDs" is a non-empty array
     And the error payload field "events.0.app.duration" is null
     And the error payload field "events.0.app.durationInForeground" is null
-    And the error payload field "events.0.device.freeDisk" is null
     And the error payload field "events.0.device.model" matches the regex "[iPad|Macmini|iPhone]1?\d,\d"
     And the error payload field "events.0.threads" is an array with 0 elements