Add os version

EmergeTools · Nov 30, 2023 · 97f73a3 · 97f73a3
1 parent f5aaea9
commit 97f73a3
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/ETTrace/ETTraceRunner/ResponseModels/ResponseModel.swift b/ETTrace/ETTraceRunner/ResponseModels/ResponseModel.swift
@@ -10,6 +10,7 @@ import Symbolicator
 
 struct ResponseModel: Decodable {
     let osBuild: String
+    let osVersion: String?
     let isSimulator: Bool
     let libraryInfo: LibraryInfo
     let cpuType: String

diff --git a/ETTrace/ETTraceRunner/RunnerHelper.swift b/ETTrace/ETTraceRunner/RunnerHelper.swift
@@ -84,12 +84,12 @@ class RunnerHelper {
         } else {
             arch = ""
         }
-        var osVersion = responseData.osBuild
-        osVersion.removeAll(where: { !$0.isLetter && !$0.isNumber })
+        var osBuild = responseData.osBuild
+        osBuild.removeAll(where: { !$0.isLetter && !$0.isNumber })
 
         let threadIds = responseData.threads.keys
         let threads = threadIds.map { responseData.threads[$0]!.stacks }
-        let symbolicator = StackSymbolicator(isSimulator: isSimulator, dSymsDir: dsyms, osVersion: osVersion, arch: arch, verbose: verbose)
+        let symbolicator = StackSymbolicator(isSimulator: isSimulator, dSymsDir: dsyms, osBuild: osBuild, osVersion: responseData.osVersion, arch: arch, verbose: verbose)
         let flamegraphs = FlamegraphGenerator.generate(
           events: responseData.events,
           threads: threads,

diff --git a/ETTrace/Symbolicator/Symbolicator.swift b/ETTrace/Symbolicator/Symbolicator.swift
@@ -21,13 +21,15 @@ public class StackSymbolicator {
 
     let isSimulator: Bool
     let dSymsDir: String?
-    let osVersion: String
+    let osBuild: String
+    let osVersion: String?
     let arch: String
     let verbose: Bool
 
-    public init(isSimulator: Bool, dSymsDir: String?, osVersion: String, arch: String, verbose: Bool) {
+    public init(isSimulator: Bool, dSymsDir: String?, osBuild: String, osVersion: String?, arch: String, verbose: Bool) {
         self.isSimulator = isSimulator
         self.dSymsDir = dSymsDir
+        self.osBuild = osBuild
         self.osVersion = osVersion
         self.arch = arch
         self.verbose = verbose
@@ -225,7 +227,7 @@ public class StackSymbolicator {
             let searchFolder = "\(FileManager.default.homeDirectoryForCurrentUser.path)/Library/Developer/Xcode/iOS DeviceSupport"
             let directories = (try? FileManager.default.contentsOfDirectory(atPath: searchFolder)) ?? []
 
-            for folder in directories where folder.contains(osVersion) && folder.hasSuffix(arch){
+            for folder in directories where folder.contains(osBuild) && folder.hasSuffix(arch){
                 return "\(searchFolder)/\(folder)/Symbols\(libPath)"
             }
             return nil

diff --git a/ETTrace/Tracer/EMGTracer.mm b/ETTrace/Tracer/EMGTracer.mm
@@ -71,10 +71,12 @@ + (NSDictionary *)getResults {
 
     const NXArchInfo *archInfo = NXGetLocalArchInfo();
     NSString *cpuType = [NSString stringWithUTF8String:archInfo->description];
+    NSOperatingSystemVersion version = [NSProcessInfo processInfo].operatingSystemVersion;
     return @{
         @"libraryInfo": EMGLibrariesData(),
         @"isSimulator": @([self isRunningOnSimulator]),
         @"osBuild": [self osBuild],
+        @"osVersion": [NSString stringWithFormat:@"%ld.%ld.%ld", (long)version.majorVersion, (long)version.minorVersion, (long)version.patchVersion],
         @"cpuType": cpuType,
         @"device": [self deviceName],
         @"threads": threads,