Prepare release 1.6.4

* Fix issue for setCaptureHeaders method not capture http response header

Author: Hongyan Jiang

Changelog.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 1.6.4
+- Fix issue for setCaptureHeaders method not capture http response headers
+
 ## 1.6.3
 - Fix duplicated beacons issue
 

Dev/InstanaAgentExample/AppDelegate.swift

@@ -13,16 +13,27 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     var window: UIWindow?   // needed on iOS 12 or lower
 
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
+        let myLog = OSLog(subsystem: "com.instana.ios.InstanaAgentExample", category: "Instana")
+
         // App needs to explicitly get user consent for metric events subscription before catching crash payloads.
         let userYes = Instana.canSubscribeCrashReporting() &&
             (UserDefaults.standard.integer(forKey: metricSubscriptionKey) == metricSubscriptionFlagYes)
 
         let options = InstanaSetupOptions(enableCrashReporting: userYes)
 //        options.slowSendInterval = 60.0
         if !Instana.setup(key: InstanaKey, reportingURL: InstanaURL, options: options) {
-            let myLog = OSLog(subsystem: "com.instana.ios.InstanaAgentExample", category: "Instana")
             os_log("Instana setup failed", log: myLog, type: .error)
         }
+
+        var headerFilterReg: [NSRegularExpression] = []
+        do {
+            let regex = try NSRegularExpression(pattern: "Content-Type", options: .caseInsensitive)
+            headerFilterReg.append(regex)
+        } catch {
+            os_log("Error creating regular expression", log: myLog, type: .error)
+        }
+        Instana.setCaptureHeaders(matching: headerFilterReg)
+
         return true
     }
 

InstanaAgent.podspec

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

Sources/InstanaAgent/Beacons/Reporter.swift

@@ -137,10 +137,7 @@ public class Reporter {
             return true
         }
 
-        var maxFlushingTimeAllowed = 10.0 // in seconds
-        if isInSlowSendMode {
-            maxFlushingTimeAllowed += session.configuration.slowSendInterval
-        }
+        let maxFlushingTimeAllowed = 10.0 // in seconds
 
         let diff = Date().timeIntervalSince1970 - lastFlushStartTime!
         if diff > maxFlushingTimeAllowed {

Sources/InstanaAgent/Configuration/VersionConfig.swift

@@ -1,3 +1,3 @@
 struct VersionConfig {
-    static let agentVersion = "1.6.3"
+    static let agentVersion = "1.6.4"
 }

Sources/InstanaAgent/Monitors/HTTP/HTTPMarker.swift

@@ -84,11 +84,32 @@ protocol HTTPMarkerDelegate: AnyObject {
     ///
     /// Note: Make sure you don't call any methods on this HTTPMarker after you called finish
     @objc public func finish(response: URLResponse?, error: Error?) {
-        let statusCode = (response as? HTTPURLResponse)?.statusCode ?? 400
+        let httpURLResponse = (response as? HTTPURLResponse)
+        let statusCode = httpURLResponse?.statusCode ?? 400
         let size = response != nil ? HTTPMarker.Size(response!) : nil
+
+        var bothHeaders: HTTPHeader = [:]
+        let filter = Instana.current?.monitors.http?.filter
+        if filter != nil, filter!.needHeaderFields() {
+            // this header means http request header
+            header?.forEach { key, value in
+                if filter!.shouldUseHeaderField(key: key) {
+                    bothHeaders[key] = value
+                }
+            }
+
+            (httpURLResponse?.allHeaderFields)?.forEach { key, value in
+                let key = key as? String
+                let value = value as? String
+                if key != nil, value != nil, filter!.shouldUseHeaderField(key: key!) {
+                    bothHeaders[key!] = value!
+                }
+            }
+        }
+
         let result = HTTPCaptureResult(statusCode: statusCode,
                                        backendTracingID: response?.backendTracingID,
-                                       header: header,
+                                       header: bothHeaders,
                                        responseSize: responseSize ?? size,
                                        error: error)
         finish(result)

Sources/InstanaAgent/Monitors/HTTP/HTTPMonitorFilter.swift

@@ -27,7 +27,11 @@ class HTTPMonitorFilter {
         return filtered
     }
 
-    private func shouldUseHeaderField(key: String) -> Bool {
+    func needHeaderFields() -> Bool {
+        return !headerFieldsRegEx.isEmpty
+    }
+
+    func shouldUseHeaderField(key: String) -> Bool {
         for regex in headerFieldsRegEx {
             let range = NSRange(location: 0, length: key.utf16.count)
             if !regex.matches(in: key, range: range).isEmpty {

Tests/InstanaAgentTests/Configuration/InstanaSystemUtilsTests.swift

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