Dogfood recent changes

CHANGELOG.md

@@ -1,3 +1,19 @@
+# 1.7.0 / 09-27-2021
+
+### Changes
+
+* [BUGFIX] RUM: Fix `DDRUMView` API visibility for Objective-C. See [#583][]
+* [FEATURE] Crash Reporting: Add `DatadogCrashReporting`
+* [FEATURE] RUM: Add Mobile Vitals. See [#493][] [#514][] [#522][] [#495][]
+* [FEATURE] RUM: Add option for renaming instrumented actions. See [#539][]
+* [FEATURE] RUM: Add option for tracking events when app is in background. See [#504][] [#537][]
+* [FEATURE] Add support for `us3` site. See [#523][]
+* [IMPROVEMENT] RUM: Improve RUM <> APM integration. See [#524][] [#575][] [#531][] (Thanks [@jracollins][], [@marcusway][])
+* [IMPROVEMENT] RUM: Improve naming for views started with `key:`. See [#534][]
+* [IMPROVEMENT] RUM: Improve actions instrumentation. See [#509][] [#545][] [#547][]
+* [IMPROVEMENT] RUM: Sanitize custom timings for views. See [#525][]
+* [IMPROVEMENT] Do not retry uploading events if Client Token is invalid. See [#535][]
+
 # 1.6.0 / 06-09-2021
 
 ### Changes
@@ -200,6 +216,24 @@
 [#479]: https://github.com/DataDog/dd-sdk-ios/issues/479
 [#481]: https://github.com/DataDog/dd-sdk-ios/issues/481
 [#483]: https://github.com/DataDog/dd-sdk-ios/issues/483
+[#493]: https://github.com/DataDog/dd-sdk-ios/issues/493
+[#495]: https://github.com/DataDog/dd-sdk-ios/issues/495
+[#504]: https://github.com/DataDog/dd-sdk-ios/issues/504
+[#509]: https://github.com/DataDog/dd-sdk-ios/issues/509
+[#514]: https://github.com/DataDog/dd-sdk-ios/issues/514
+[#522]: https://github.com/DataDog/dd-sdk-ios/issues/522
+[#523]: https://github.com/DataDog/dd-sdk-ios/issues/523
+[#524]: https://github.com/DataDog/dd-sdk-ios/issues/524
+[#525]: https://github.com/DataDog/dd-sdk-ios/issues/525
+[#531]: https://github.com/DataDog/dd-sdk-ios/issues/531
+[#534]: https://github.com/DataDog/dd-sdk-ios/issues/534
+[#535]: https://github.com/DataDog/dd-sdk-ios/issues/535
+[#537]: https://github.com/DataDog/dd-sdk-ios/issues/537
+[#539]: https://github.com/DataDog/dd-sdk-ios/issues/539
+[#545]: https://github.com/DataDog/dd-sdk-ios/issues/545
+[#547]: https://github.com/DataDog/dd-sdk-ios/issues/547
+[#575]: https://github.com/DataDog/dd-sdk-ios/issues/575
+[#583]: https://github.com/DataDog/dd-sdk-ios/issues/583
 [@00FA9A]: https://github.com/00FA9A
 [@Britton-Earnin]: https://github.com/Britton-Earnin
 [@Hengyu]: https://github.com/Hengyu
@@ -211,8 +245,10 @@
 [@hyling]: https://github.com/hyling
 [@jegnux]: https://github.com/jegnux
 [@joeydong]: https://github.com/joeydong
+[@jracollins]: https://github.com/jracollins
 [@lgaches]: https://github.com/lgaches
 [@lmramirez]: https://github.com/lmramirez
+[@marcusway]: https://github.com/marcusway
 [@philtre]: https://github.com/philtre
 [@provTheodoreNewell]: https://github.com/provTheodoreNewell
 [@sdejesusF]: https://github.com/sdejesusF

Cartfile

@@ -1,2 +1,2 @@
 github "lyft/Kronos" ~> 4.2
-github "microsoft/plcrashreporter" == 1.8.1
+github "microsoft/plcrashreporter" ~> 1.10.0

Cartfile.resolved

@@ -1,2 +1,2 @@
 github "lyft/Kronos" "4.2.1"
-github "microsoft/plcrashreporter" "1.8.1"
+github "microsoft/plcrashreporter" "1.10.0"

Datadog/Datadog.xcodeproj/xcshareddata/xcschemes/Datadog.xcscheme

@@ -76,6 +76,11 @@
             value = "1"
             isEnabled = "YES">
          </EnvironmentVariable>
+         <EnvironmentVariable
+            key = "DD_DISABLE_NETWORK_INSTRUMENTATION"
+            value = "$(DD_DISABLE_NETWORK_INSTRUMENTATION)"
+            isEnabled = "YES">
+         </EnvironmentVariable>
          <EnvironmentVariable
             key = "SRCROOT"
             value = "$(SRCROOT)"

Datadog/Datadog.xcodeproj/xcshareddata/xcschemes/Example.xcscheme

@@ -56,6 +56,11 @@
             value = "LoggingManualInstrumentationScenario"
             isEnabled = "NO">
          </EnvironmentVariable>
+         <EnvironmentVariable
+            key = "DD_TEST_SCENARIO_CLASS_NAME"
+            value = "RUMMobileVitalsScenario"
+            isEnabled = "NO">
+         </EnvironmentVariable>
          <EnvironmentVariable
             key = "DD_TEST_SCENARIO_CLASS_NAME"
             value = "TracingManualInstrumentationScenario"

Datadog/E2ETests/E2ETests.swift

@@ -31,23 +31,24 @@ class E2ETests: XCTestCase {
 
     /// - common performance monitor - measures `Datadog.initialize(...)` performance:
     /// ```apm
+    /// $feature = core
     /// $monitor_id = sdk_initialize_performance
     /// $monitor_name = "[RUM] [iOS] Nightly Performance - sdk_initialize: has a high average execution time"
-    /// $monitor_query = "avg(last_1d):avg:trace.sdk_initialize{env:instrumentation,resource_name:sdk_initialize,service:com.datadog.ios.nightly} > 0.016"
+    /// $monitor_query = "avg(last_1d):avg:trace.perf_measure{env:instrumentation,resource_name:sdk_initialize,service:com.datadog.ios.nightly} > 0.016"
     /// $monitor_threshold = 0.016
     /// ```
 
     // MARK: - Measuring Performance with APM
 
-    /// Measures time of execution for given `block` - sends it as a `Span` with a given name.
-    func measure(spanName: String, _ block: () -> Void) {
+    /// Measures time of execution for given `block` - sends it as a `"perf_measure"` `Span` with a given resource name.
+    func measure(resourceName: String, _ block: () -> Void) {
         let start = Date()
         block()
         let stop = Date()
 
-        Global.sharedTracer
-            .startRootSpan(operationName: spanName, startTime: start)
-            .finish(at: stop)
+        let performanceSpan = Global.sharedTracer.startRootSpan(operationName: "perf_measure", startTime: start)
+        performanceSpan.setTag(key: DDTags.resource, value: resourceName)
+        performanceSpan.finish(at: stop)
     }
 
     // MARK: - SDK Lifecycle

Datadog/E2ETests/Logging/LoggerBuilderE2ETests.swift

@@ -18,9 +18,10 @@ class LoggerBuilderE2ETests: E2ETests {
 
     /// - common performance monitor - measures `Logger.builder.build()` performance:
     /// ```apm
+    /// $feature = logs
     /// $monitor_id = logs_logger_initialize_performance
     /// $monitor_name = "[RUM] [iOS] Nightly Performance - logs_logger_initialize: has a high average execution time"
-    /// $monitor_query = "avg(last_1d):avg:trace.logs_logger_initialize{env:instrumentation,resource_name:logs_logger_initialize,service:com.datadog.ios.nightly} > 0.016"
+    /// $monitor_query = "avg(last_1d):avg:trace.perf_measure{env:instrumentation,resource_name:logs_logger_initialize,service:com.datadog.ios.nightly} > 0.016"
     /// $monitor_threshold = 0.016
     /// ```
 
@@ -35,7 +36,7 @@ class LoggerBuilderE2ETests: E2ETests {
     /// $monitor_query = "logs(\"service:com.datadog.ios.nightly.custom @test_method_name:logs_logger_builder_set_service_name\").index(\"*\").rollup(\"count\").last(\"1d\") < 1"
     /// ```
     func test_logs_logger_builder_set_SERVICE_NAME() {
-        measure(spanName: DD.PerfSpanName.loggerInitialize) {
+        measure(resourceName: DD.PerfSpanName.loggerInitialize) {
             logger = Logger.builder.set(serviceName: "com.datadog.ios.nightly.custom").build()
         }
 
@@ -51,7 +52,7 @@ class LoggerBuilderE2ETests: E2ETests {
     /// $monitor_query = "logs(\"service:com.datadog.ios.nightly @test_method_name:logs_logger_builder_set_logger_name @logger.name:custom_logger_name\").index(\"*\").rollup(\"count\").last(\"1d\") < 1"
     /// ```
     func test_logs_logger_builder_set_LOGGER_NAME() {
-        measure(spanName: DD.PerfSpanName.loggerInitialize) {
+        measure(resourceName: DD.PerfSpanName.loggerInitialize) {
             logger = Logger.builder.set(loggerName: "custom_logger_name").build()
         }
 
@@ -67,7 +68,7 @@ class LoggerBuilderE2ETests: E2ETests {
     /// $monitor_query = "logs(\"service:com.datadog.ios.nightly @test_method_name:logs_logger_builder_send_network_info_enabled @network.client.reachability:*\").index(\"*\").rollup(\"count\").last(\"1d\") < 1"
     /// ```
     func test_logs_logger_builder_SEND_NETWORK_INFO_enabled() {
-        measure(spanName: DD.PerfSpanName.loggerInitialize) {
+        measure(resourceName: DD.PerfSpanName.loggerInitialize) {
             logger = Logger.builder.sendNetworkInfo(true).build()
         }
 
@@ -85,7 +86,7 @@ class LoggerBuilderE2ETests: E2ETests {
     /// $notify_no_data = false
     /// ```
     func test_logs_logger_builder_SEND_NETWORK_INFO_disabled() {
-        measure(spanName: DD.PerfSpanName.loggerInitialize) {
+        measure(resourceName: DD.PerfSpanName.loggerInitialize) {
             logger = Logger.builder.sendNetworkInfo(false).build()
         }
 
@@ -103,7 +104,7 @@ class LoggerBuilderE2ETests: E2ETests {
     /// $monitor_query = "logs(\"service:com.datadog.ios.nightly @test_method_name:logs_logger_builder_send_logs_to_datadog_enabled\").index(\"*\").rollup(\"count\").last(\"1d\") < 1"
     /// ```
     func test_logs_logger_builder_SEND_LOGS_TO_DATADOG_enabled() {
-        measure(spanName: DD.PerfSpanName.loggerInitialize) {
+        measure(resourceName: DD.PerfSpanName.loggerInitialize) {
             logger = Logger.builder.sendLogsToDatadog(true).build()
         }
 
@@ -121,7 +122,7 @@ class LoggerBuilderE2ETests: E2ETests {
     /// $notify_no_data = false
     /// ```
     func test_logs_logger_builder_SEND_LOGS_TO_DATADOG_disabled() {
-        measure(spanName: DD.PerfSpanName.loggerInitialize) {
+        measure(resourceName: DD.PerfSpanName.loggerInitialize) {
             logger = Logger.builder.sendLogsToDatadog(false).build()
         }
 
@@ -137,7 +138,7 @@ class LoggerBuilderE2ETests: E2ETests {
     /// $monitor_query = "logs(\"service:com.datadog.ios.nightly @test_method_name:logs_logger_builder_print_logs_to_console_enabled\").index(\"*\").rollup(\"count\").last(\"1d\") < 1"
     /// ```
     func test_logs_logger_builder_PRINT_LOGS_TO_CONSOLE_enabled() {
-        measure(spanName: DD.PerfSpanName.loggerInitialize) {
+        measure(resourceName: DD.PerfSpanName.loggerInitialize) {
             logger = Logger.builder.printLogsToConsole(true, usingFormat: .random()).build()
         }
 
@@ -153,7 +154,7 @@ class LoggerBuilderE2ETests: E2ETests {
     /// $monitor_query = "logs(\"service:com.datadog.ios.nightly @test_method_name:logs_logger_builder_print_logs_to_console_disabled\").index(\"*\").rollup(\"count\").last(\"1d\") < 1"
     /// ```
     func test_logs_logger_builder_PRINT_LOGS_TO_CONSOLE_disabled() {
-        measure(spanName: DD.PerfSpanName.loggerInitialize) {
+        measure(resourceName: DD.PerfSpanName.loggerInitialize) {
             logger = Logger.builder.printLogsToConsole(false, usingFormat: .random()).build()
         }
 
@@ -171,7 +172,7 @@ class LoggerBuilderE2ETests: E2ETests {
     /// $monitor_query = "logs(\"service:com.datadog.ios.nightly @test_method_name:logs_logger_builder_bundle_with_rum_enabled @application_id:* @session_id:*\").index(\"*\").rollup(\"count\").last(\"1d\") < 1"
     /// ```
     func test_logs_logger_builder_BUNDLE_WITH_RUM_enabled() {
-        measure(spanName: DD.PerfSpanName.loggerInitialize) {
+        measure(resourceName: DD.PerfSpanName.loggerInitialize) {
             logger = Logger.builder.bundleWithRUM(true).build()
         }
 
@@ -193,7 +194,7 @@ class LoggerBuilderE2ETests: E2ETests {
     /// $notify_no_data = false
     /// ```
     func test_logs_logger_builder_BUNDLE_WITH_RUM_disabled() {
-        measure(spanName: DD.PerfSpanName.loggerInitialize) {
+        measure(resourceName: DD.PerfSpanName.loggerInitialize) {
             logger = Logger.builder.bundleWithRUM(false).build()
         }
 
@@ -215,7 +216,7 @@ class LoggerBuilderE2ETests: E2ETests {
     /// $monitor_query = "logs(\"service:com.datadog.ios.nightly @test_method_name:logs_logger_builder_bundle_with_trace_enabled\").index(\"*\").rollup(\"count\").last(\"1d\") < 1"
     /// ```
     func test_logs_logger_builder_BUNDLE_WITH_TRACE_enabled() {
-        measure(spanName: DD.PerfSpanName.loggerInitialize) {
+        measure(resourceName: DD.PerfSpanName.loggerInitialize) {
             logger = Logger.builder.bundleWithTrace(true).build()
         }
 
@@ -235,7 +236,7 @@ class LoggerBuilderE2ETests: E2ETests {
     /// $monitor_query = "logs(\"service:com.datadog.ios.nightly @test_method_name:logs_logger_builder_bundle_with_trace_disabled\").index(\"*\").rollup(\"count\").last(\"1d\") < 1"
     /// ```
     func test_logs_logger_builder_BUNDLE_WITH_TRACE_disabled() {
-        measure(spanName: DD.PerfSpanName.loggerInitialize) {
+        measure(resourceName: DD.PerfSpanName.loggerInitialize) {
             logger = Logger.builder.bundleWithTrace(false).build()
         }