Fix crash caused by appendMetaData()

Author: Hongyan Jiang

Changelog.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 1.6.1
+- Fix crash caused by appendMetaData() inside InstanaProperties class
+
 ## 1.6.0
 - Refactor code and add more unit test cases
 

InstanaAgent.podspec

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

Sources/InstanaAgent/Beacons/CoreBeacon/CoreBeaconFactory.swift

@@ -51,7 +51,8 @@ extension CoreBeacon {
         ui = properties.user?.id
         un = properties.user?.name
         ue = properties.user?.email
-        m = !properties.metaData.isEmpty ? properties.metaData : nil
+        let localMeta = properties.getMetaData()
+        m = !localMeta.isEmpty ? localMeta : nil
     }
 
     mutating func append(_ beacon: HTTPBeacon) {

Sources/InstanaAgent/Configuration/InstanaProperties.swift

@@ -41,7 +41,8 @@ class InstanaProperties {
     }
 
     var user: User?
-    private(set) var metaData = MetaData()
+    private var metaData = MetaData()
+    private let queueMetaData = DispatchQueue(label: "com.instana.ios.agent.metadata", attributes: .concurrent)
 
     static let viewMaxLength = 256
     var view: String? {
@@ -59,8 +60,19 @@ class InstanaProperties {
     func appendMetaData(_ key: String, _ value: String) {
         let key = MetaData.validate(key: key)
         let value = MetaData.validate(value: value)
-        if metaData.count < MetaData.Max.numberOfMetaEntries {
-            metaData[key] = value
+        queueMetaData.async(flags: .barrier) { [weak self] in
+            guard let self = self else {
+                return
+            }
+            if self.metaData.count < MetaData.Max.numberOfMetaEntries {
+                self.metaData[key] = value
+            }
+        }
+    }
+
+    func getMetaData() -> MetaData {
+        return queueMetaData.sync {
+            self.metaData
         }
     }
 

Sources/InstanaAgent/Configuration/VersionConfig.swift

@@ -1,3 +1,3 @@
 struct VersionConfig {
-    static let agentVersion = "1.6.0"
+    static let agentVersion = "1.6.1"
 }

Tests/InstanaAgentTests/Configuration/InstanaSystemUtilsTests.swift

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