From 25267638cf0423d535340b6aa9da61f6c64a425f Mon Sep 17 00:00:00 2001
From: Denes <denes@cursorinsight.com>
Date: Tue, 11 Jun 2024 10:38:33 +0200
Subject: [PATCH] feat: Add application version to HeaderEvent

The Trap version constant was also renamed from App.version to
Trap.version to distinguish the two.
---
 Sources/Trap/Constants.swift        |  2 +-
 Sources/Trap/Manager/Reporter.swift | 21 +++++++++++++++++++--
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/Sources/Trap/Constants.swift b/Sources/Trap/Constants.swift
index 1f34d35..6ede25d 100644
--- a/Sources/Trap/Constants.swift
+++ b/Sources/Trap/Constants.swift
@@ -1,5 +1,5 @@
 struct Constants {
-    struct App {
+    struct Trap {
         static let version = "1.1.4"
     }
 }
diff --git a/Sources/Trap/Manager/Reporter.swift b/Sources/Trap/Manager/Reporter.swift
index d2f1752..d9bb61c 100644
--- a/Sources/Trap/Manager/Reporter.swift
+++ b/Sources/Trap/Manager/Reporter.swift
@@ -26,6 +26,9 @@ class TrapReporter {
     /// The endpoint of the reporter to use
     private let config: TrapConfig
 
+    /// Application version (for the embedding application)
+    private let appVersion: String
+
     /// The streamId of this continuous data stream.
     private var streamId = UUID()
 
@@ -42,6 +45,7 @@ class TrapReporter {
         self.storage = storage
         self.config = config
         self.transport = nil
+        self.appVersion = Bundle.main.appVersion
     }
 
     deinit {
@@ -92,7 +96,7 @@ class TrapReporter {
             }
             let group = DispatchGroup()
             group.enter()
-            
+
             let data = this.storage
                 .sorted { $0.0 < $1.0 }
                 .map(\.1)
@@ -140,7 +144,8 @@ class TrapReporter {
             DataType.string(streamId.uuidString),
             DataType.int(sequenceId),
             DataType.dict(["version": DataType.string("20230706T094422Z")]),
-            DataType.string(Constants.App.version)
+            DataType.string(Constants.Trap.version),
+            DataType.string(appVersion)
         ])
 
         sequenceId += 1
@@ -148,3 +153,15 @@ class TrapReporter {
         return header
     }
 }
+
+extension Bundle {
+    /// Gets the application version
+    var appVersion: String {
+        if let infoDictionary = Bundle.main.infoDictionary,
+            let name = infoDictionary["CFBundleName"],
+            let version = infoDictionary["CFBundleVersion"] {
+            return "\(name) (\(version))"
+        }
+        return "Unknown"
+    }
+}