Low Memory beacon does not include used memory

Author: Hongyan Jiang

Changelog.md

@@ -1,9 +1,8 @@
 # Changelog
 
-## 1.9.0
-- add option to configure rate limit
+## 1.8.8
+- add option to configure rate limit, drop beacons and performance beacons
 - send drop beacons and performance beacons (app launch time, low memory warning, application not responding)to Instana backend
-- allow caller enable/disable the new features through configuration
 
 ## 1.8.7
 - queryTrackedDomainList configuration to capture http query parameters if url is in the white listed RegExp array

InstanaAgent.podspec

@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
   #
 
   s.name         = "InstanaAgent"
-  s.version      = "1.9.0"
+  s.version      = "1.8.8"
   s.summary      = "Instana iOS agent."
 
   # This description is used to generate tags and improve search results.

Sources/InstanaAgent/Beacons/Beacons Types/PerformanceBeacons/PerfLowMemoryBeacon.swift

@@ -9,7 +9,7 @@ class PerfLowMemoryBeacon: PerformanceBeacon {
     let availableMemory: UInt64?
     let maximumMemory: UInt64?
 
-    init(usedMemory: UInt64?, availableMemory: UInt64?, maximumMemory: UInt64?) {
+    init(usedMemory: UInt64? = nil, availableMemory: UInt64?, maximumMemory: UInt64?) {
         self.usedMemory = usedMemory
         self.availableMemory = availableMemory
         self.maximumMemory = maximumMemory

Sources/InstanaAgent/Configuration/VersionConfig.swift

@@ -1,3 +1,3 @@
 struct VersionConfig {
-    static let agentVersion = "1.9.0"
+    static let agentVersion = "1.8.8"
 }

Sources/InstanaAgent/Monitors/Performance/LowMemoryMonitor.swift

@@ -6,7 +6,7 @@ import Foundation
 #if os(tvOS) || os(watchOS) || os(iOS)
     import UIKit
 #endif
-import MachO
+import os
 
 class LowMemoryMonitor {
     let reporter: Reporter
@@ -22,43 +22,13 @@ class LowMemoryMonitor {
 
     @objc func onLowMemoryWarning(notification: Notification) {
         let unit = UInt64(1024 * 1024)
-        let usedMemory = getUsedMemory()
-        let freeMemory = getFreeMemory()
-        let maxMemory: UInt64 = ProcessInfo.processInfo.physicalMemory
-        // in mega bytes
-        reporter.submit(PerfLowMemoryBeacon(usedMemory: usedMemory != nil ? usedMemory! / unit : nil,
-                                            availableMemory: freeMemory != nil ? freeMemory! / unit : nil,
-                                            maximumMemory: maxMemory / unit))
-    }
-
-    func getUsedMemory() -> UInt64? {
-        var taskVMInfo = task_vm_info_data_t()
-        var vmSize = mach_msg_type_number_t(MemoryLayout<task_vm_info>.size) / 4
-        let kernResult: kern_return_t = withUnsafeMutablePointer(to: &taskVMInfo) {
-            $0.withMemoryRebound(to: integer_t.self, capacity: 1) {
-                task_info(mach_task_self_, task_flavor_t(TASK_VM_INFO), $0, &vmSize)
-            }
-        }
-        if kernResult == KERN_SUCCESS {
-            return UInt64(taskVMInfo.phys_footprint)
-        }
-        return nil
-    }
-
-    func getFreeMemory() -> UInt64? {
-        var vmStats = vm_statistics64()
-        var vmSize = mach_msg_type_number_t(MemoryLayout<vm_statistics64>.size) / 4
-
-        let machHost = mach_host_self()
-        let ret = withUnsafeMutablePointer(to: &vmStats) {
-            $0.withMemoryRebound(to: integer_t.self, capacity: Int(vmSize)) {
-                host_statistics64(machHost, HOST_VM_INFO64, $0, &vmSize)
-            }
+        var freeMemory: UInt64?
+        if #available(iOS 13.0, *) {
+            freeMemory = UInt64(os_proc_available_memory()) / unit
         }
+        let maxMemory: UInt64 = ProcessInfo.processInfo.physicalMemory / unit
 
-        if ret == KERN_SUCCESS {
-            return UInt64(vmStats.free_count) * UInt64(vm_kernel_page_size)
-        }
-        return nil
+        // in mega bytes
+        reporter.submit(PerfLowMemoryBeacon(availableMemory: freeMemory, maximumMemory: maxMemory))
     }
 }

Tests/InstanaAgentTests/Configuration/InstanaSystemUtilsTests.swift

@@ -5,7 +5,7 @@ class InstanaSystemUtilsTests: InstanaTestCase {
 
     func test_AgentVersion() {
         // Then
-        AssertTrue(InstanaSystemUtils.agentVersion == "1.9.0")
+        AssertTrue(InstanaSystemUtils.agentVersion == "1.8.8")
     }
 
     func test_systemVersion() {