use platform checker

denrase · denrase · commit 1ab1f7e23301 · 2024-07-02T11:01:44.000+02:00
diff --git a/dart/lib/src/event_processor/enricher/io_enricher_event_processor.dart b/dart/lib/src/event_processor/enricher/io_enricher_event_processor.dart
@@ -103,12 +103,12 @@ class IoEnricherEventProcessor implements EnricherEventProcessor {
   }
 
   SentryDevice _getDevice(SentryDevice? device) {
-    final platformMemory = PlatformMemory(Platform.operatingSystem, _options);
+    final platformMemory = PlatformMemory(_options);
     return (device ?? SentryDevice()).copyWith(
       name: device?.name ?? Platform.localHostname,
       processorCount: device?.processorCount ?? Platform.numberOfProcessors,
-      memorySize: platformMemory.getTotalPhysicalMemory() ?? device?.memorySize,
-      freeMemory: platformMemory.getFreePhysicalMemory() ?? device?.freeMemory,
+      memorySize: device?.memorySize ?? platformMemory.getTotalPhysicalMemory(),
+      freeMemory: device?.freeMemory ?? platformMemory.getFreePhysicalMemory(),
     );
   }
 
diff --git a/dart/lib/src/event_processor/enricher/io_platform_memory.dart b/dart/lib/src/event_processor/enricher/io_platform_memory.dart
@@ -6,30 +6,27 @@ import '../../sentry_options.dart';
 // Get total & free platform memory (in bytes) for linux and windows operating systems.
 // Source: https://github.com/onepub-dev/system_info/blob/8a9bf6b8eb7c86a09b3c3df4bf6d7fa5a6b50732/lib/src/platform/memory.dart
 class PlatformMemory {
-  PlatformMemory(this.operatingSystem, this.options);
+  PlatformMemory(this.options);
 
-  final String operatingSystem;
   final SentryOptions options;
 
   int? getTotalPhysicalMemory() {
-    switch (operatingSystem) {
-      case 'linux':
-        return _getLinuxMemInfoValue('MemTotal');
-      case 'windows':
-        return _getWindowsWmicValue('ComputerSystem', 'TotalPhysicalMemory');
-      default:
-        return null;
+    if (options.platformChecker.platform.isLinux) {
+      return _getLinuxMemInfoValue('MemTotal');
+    } else if (options.platformChecker.platform.isWindows) {
+      return _getWindowsWmicValue('ComputerSystem', 'TotalPhysicalMemory');
+    } else {
+      return null;
     }
   }
 
   int? getFreePhysicalMemory() {
-    switch (operatingSystem) {
-      case 'linux':
-        return _getLinuxMemInfoValue('MemFree');
-      case 'windows':
-        return _getWindowsWmicValue('OS', 'FreePhysicalMemory');
-      default:
-        return null;
+    if (options.platformChecker.platform.isLinux) {
+      return _getLinuxMemInfoValue('MemFree');
+    } else if (options.platformChecker.platform.isWindows) {
+      return _getWindowsWmicValue('OS', 'FreePhysicalMemory');
+    } else {
+      return null;
     }
   }
 
diff --git a/dart/test/event_processor/enricher/io_platform_memory_test.dart b/dart/test/event_processor/enricher/io_platform_memory_test.dart
@@ -55,6 +55,6 @@ class Fixture {
   var options = SentryOptions();
 
   PlatformMemory getSut() {
-    return PlatformMemory(Platform.operatingSystem, options);
+    return PlatformMemory(options);
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -103,12 +103,12 @@ class IoEnricherEventProcessor implements EnricherEventProcessor {`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`SentryDevice _getDevice(SentryDevice? device) {`
`106`		`- final platformMemory = PlatformMemory(Platform.operatingSystem, _options);`
	`106`	`+ final platformMemory = PlatformMemory(_options);`
`107`	`107`	`return (device ?? SentryDevice()).copyWith(`
`108`	`108`	`name: device?.name ?? Platform.localHostname,`
`109`	`109`	`processorCount: device?.processorCount ?? Platform.numberOfProcessors,`
`110`		`- memorySize: platformMemory.getTotalPhysicalMemory() ?? device?.memorySize,`
`111`		`- freeMemory: platformMemory.getFreePhysicalMemory() ?? device?.freeMemory,`
	`110`	`+ memorySize: device?.memorySize ?? platformMemory.getTotalPhysicalMemory(),`
	`111`	`+ freeMemory: device?.freeMemory ?? platformMemory.getFreePhysicalMemory(),`
`112`	`112`	`);`
`113`	`113`	`}`
`114`	`114`
Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,6 @@ class Fixture {`
`55`	`55`	`var options = SentryOptions();`
`56`	`56`
`57`	`57`	`PlatformMemory getSut() {`
`58`		`- return PlatformMemory(Platform.operatingSystem, options);`
	`58`	`+ return PlatformMemory(options);`
`59`	`59`	`}`
`60`	`60`	`}`