Default configuration update for performance monitoring (#81)

Author: Hongyan Jiang

Changelog.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 1.9.0
+- enable app launch time monitoring by default, other performance monitoring off
+
 ## 1.8.9
 - fix pod lib lint error
 

Dev/InstanaAgentExample/AppDelegate.swift

@@ -29,7 +29,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 //        options.debugAllScreenNames = true
         options.queryTrackedDomainList = queryTrackedDomainList
 //        options.dropBeaconReporting = true
-//        options.perfConfig = InstanaPerformanceConfig(enableAnrReport: true, anrThreshold: 5.0)
+//        options.rateLimits = .MID_LIMITS
+//        options.perfConfig = InstanaPerformanceConfig(enableAnrReport: true, anrThreshold: 5.0, enableLowMemoryReport: true)
         if !Instana.setup(key: InstanaKey, reportingURL: InstanaURL, options: options) {
             os_log("Instana setup failed", log: myLog, type: .error)
         }

InstanaAgent.podspec

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

Sources/InstanaAgent/Configuration/InstanaConfiguraton.swift

@@ -99,7 +99,7 @@ class InstanaConfiguration {
         self.httpCaptureConfig = httpCaptureConfig
         monitorTypes = MonitorTypes.current
         // Performance monitor
-        if perfConfig?.enableAppStartTimeReport == true {
+        if perfConfig?.enableAppStartTimeReport != false {
             monitorTypes.insert(.appLaunchTime)
         }
         if perfConfig?.enableLowMemoryReport == true {

Sources/InstanaAgent/Configuration/VersionConfig.swift

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

Sources/InstanaAgent/InstanaSetupOptions.swift

@@ -72,11 +72,11 @@ import Foundation
     var enableAppStartTimeReport: Bool = true
     var enableAnrReport: Bool = false
     var anrThreshold: Double = 3.0 // in seconds
-    var enableLowMemoryReport: Bool = true
+    var enableLowMemoryReport: Bool = false
 
     @objc public
-    init(enableAppStartTimeReport: Bool = false, enableAnrReport: Bool = true,
-         anrThreshold: Double = 3.0, enableLowMemoryReport: Bool = true) {
+    init(enableAppStartTimeReport: Bool = true, enableAnrReport: Bool = true,
+         anrThreshold: Double = 3.0, enableLowMemoryReport: Bool = false) {
         self.enableAppStartTimeReport = enableAppStartTimeReport
         self.enableAnrReport = enableAnrReport
         self.anrThreshold = anrThreshold

Tests/InstanaAgentTests/Configuration/InstanaConfigurationTests.swift

@@ -21,7 +21,7 @@ class InstanaConfigurationTests: InstanaTestCase {
         AssertTrue(config.maxRetries == 3)
         AssertTrue(config.preQueueUsageTime == 2)
         AssertTrue(config.reporterSendLowBatteryDebounce == 10)
-        AssertTrue(config.monitorTypes.count == 2)
+        AssertTrue(config.monitorTypes.count == 3)
         AssertTrue(config.monitorTypes.contains(.http))
         AssertTrue(config.reporterRateLimits.count == 2)
         AssertTrue(config.reporterRateLimits.first?.maxItems == 20)
@@ -88,4 +88,13 @@ class InstanaConfigurationTests: InstanaTestCase {
         AssertEqualAndNotNil(limiter.timeout, 60 * 5)
         AssertEqualAndNotNil(limiter.maxItems, 2500)
     }
+
+    func test_performance_default() {
+        let config = InstanaConfiguration.default(key: "a",
+                                                  reportingURL: url,
+                                                  enableCrashReporting: false)
+        AssertTrue(config.monitorTypes.contains(.appLaunchTime))
+        AssertFalse(config.monitorTypes.contains(.memoryWarning))
+        AssertFalse(config.monitorTypes.contains(.alertApplicationNotResponding(threshold: 3.0)))
+    }
 }

Tests/InstanaAgentTests/Configuration/InstanaSystemUtilsTests.swift

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

Tests/InstanaAgentTests/InstanaSetupOptionsTest.swift

@@ -56,7 +56,7 @@ class InstanaPerformanceConfigTests: XCTestCase {
     func test_setEnableLowMemoryReport() {
         // Given
         let pfConfig = InstanaPerformanceConfig()
-        AssertTrue(pfConfig.enableLowMemoryReport)
+        AssertFalse(pfConfig.enableLowMemoryReport)
 
         // When
         pfConfig.setEnableLowMemoryReport(false)
@@ -80,7 +80,7 @@ class InstanaPerformanceConfigTests: XCTestCase {
         AssertEqualAndNotNil(pfConfig.enableAppStartTimeReport, true)
         AssertEqualAndNotNil(pfConfig.enableAnrReport, false)
         AssertEqualAndNotNil(pfConfig.anrThreshold, 3.0)
-        AssertEqualAndNotNil(pfConfig.enableLowMemoryReport, true)
+        AssertEqualAndNotNil(pfConfig.enableLowMemoryReport, false)
     }
 }
 

Tests/InstanaAgentTests/InstanaTests.swift

@@ -112,10 +112,10 @@ class InstanaTests: InstanaTestCase {
         AssertTrue(Instana.current!.session.collectionEnabled)
         AssertEqualAndNotNil(Instana.sessionID, Instana.current?.session.id.uuidString)
         AssertEqualAndNotNil(Instana.reportingURL, reportingURL)
+        AssertEqualAndNotNil(Instana.current?.session.configuration.key, key)
         AssertEqualAndNotNil(Instana.current?.session.configuration.reportingURL, reportingURL)
         AssertEqualAndNotNil(Instana.current?.session.configuration.httpCaptureConfig, .automatic)
-        AssertEqualAndNotNil(Instana.current?.session.configuration,
-                             .default(key: key, reportingURL: reportingURL, enableCrashReporting: false))
+        AssertFalse(Instana.current!.session.configuration.monitorTypes.contains(.crash))
         AssertEqualAndNotNil(Instana.current?.session.configuration.slowSendInterval, 0.0)
         AssertEqualAndNotNil(Instana.current?.session.configuration.usiRefreshTimeIntervalInHrs, defaultUsiRefreshTimeIntervalInHrs)
     }
@@ -174,10 +174,6 @@ class InstanaTests: InstanaTestCase {
         AssertEqualAndNotNil(Instana.reportingURL, reportingURL)
         AssertEqualAndNotNil(Instana.current?.session.configuration.reportingURL, reportingURL)
         AssertEqualAndNotNil(Instana.current?.session.configuration.httpCaptureConfig, .manual)
-        AssertEqualAndNotNil(Instana.current?.session.configuration,
-                             .default(key: key, reportingURL: reportingURL,
-                                      httpCaptureConfig: httpCaptureConfig,
-                                      enableCrashReporting: false))
     }
 
     func test_setup_automaticAndManual_http_capture() {
@@ -196,10 +192,6 @@ class InstanaTests: InstanaTestCase {
         AssertEqualAndNotNil(Instana.reportingURL, reportingURL)
         AssertEqualAndNotNil(Instana.current?.session.configuration.reportingURL, reportingURL)
         AssertEqualAndNotNil(Instana.current?.session.configuration.httpCaptureConfig, .automaticAndManual)
-        AssertEqualAndNotNil(Instana.current?.session.configuration,
-                             .default(key: key, reportingURL: reportingURL,
-                                      httpCaptureConfig: httpCaptureConfig,
-                                      enableCrashReporting: false))
     }
 
     func test_setup_and_expect_SessionProfileBeacon() {