Merge pull request #952 from DataDog/ncreated/sync-develop-with-master

Merge `master` into `develop`

Author: ncreated

Sources/Datadog/RUM/Debugging/RUMDebugging.swift

@@ -123,8 +123,8 @@ internal class RUMDebugging {
 
 internal class RUMViewOutline: RUMDebugView {
     private struct Constants {
-        static let activeViewColor =  #colorLiteral(red: 0.3882352941, green: 0.1725490196, blue: 0.6509803922, alpha: 1)
-        static let inactiveViewColor =  #colorLiteral(red: 0.6000000238, green: 0.6000000238, blue: 0.6000000238, alpha: 1)
+        static let activeViewColor = #colorLiteral(red: 0.3882352941, green: 0.1725490196, blue: 0.6509803922, alpha: 1)
+        static let inactiveViewColor = #colorLiteral(red: 0.6000000238, green: 0.6000000238, blue: 0.6000000238, alpha: 1)
         static let labelHeight: CGFloat = 16
 
         static let viewNameTextAttributes: [NSAttributedString.Key: Any] = [

docs/rum_collection/_index.md

@@ -76,7 +76,7 @@ Datadog.initialize(
         .set(serviceName: "app-name")
         .set(endpoint: .us1)
         .trackUIKitRUMViews()
-        .trackUIKitActions()
+        .trackUIKitRUMActions()
         .trackURLSession()
         .build()
 )
@@ -117,7 +117,7 @@ Datadog.initialize(
         .set(serviceName: "app-name")
         .set(endpoint: .eu1)
         .trackUIKitRUMViews()
-        .trackUIKitActions()
+        .trackUIKitRUMActions()
         .trackURLSession()
         .build()
 )
@@ -158,7 +158,7 @@ Datadog.initialize(
         .set(serviceName: "app-name")
         .set(endpoint: .us3)
         .trackUIKitRUMViews()
-        .trackUIKitActions()
+        .trackUIKitRUMActions()
         .trackURLSession()
         .build()
 )
@@ -199,7 +199,7 @@ Datadog.initialize(
         .set(serviceName: "app-name")
         .set(endpoint: .us5)
         .trackUIKitRUMViews()
-        .trackUIKitActions()
+        .trackUIKitRUMActions()
         .trackURLSession()
         .build()
 )
@@ -240,7 +240,7 @@ Datadog.initialize(
         .set(serviceName: "app-name")
         .set(endpoint: .us1_fed)
         .trackUIKitRUMViews()
-        .trackUIKitActions()
+        .trackUIKitRUMActions()
         .trackURLSession()
         .build()
 )
@@ -346,4 +346,4 @@ Crash Reporting and Error Tracking for iOS displays any issues and latest availa
 [9]: https://docs.datadoghq.com/real_user_monitoring/ios/advanced_configuration/#initialization-parameters
 [10]: https://docs.datadoghq.com/real_user_monitoring/explorer/
 [11]: https://docs.datadoghq.com/getting_started/tagging/using_tags/#rum--session-replay
-[12]: https://docs.datadoghq.com/real_user_monitoring/ios/web_view_tracking/
+[12]: https://docs.datadoghq.com/real_user_monitoring/ios/web_view_tracking/

docs/rum_collection/crash_reporting.md

@@ -1,15 +1,3 @@
----
-title: iOS Crash Reporting and Error Tracking
-kind: documentation
-beta: true
-further_reading:
-  - link: "https://datadoghq.com/blog/ios-crash-reporting-datadog/"
-    tag: "Blog"
-    text: "Introducing iOS Crash Reporting and Error Tracking"
-  - link: "/real_user_monitoring"
-    tag: "Documentation"
-    text: "Learn how to explore your RUM data"
----
 ## Overview
 
 Enable iOS Crash Reporting and Error Tracking to get comprehensive crash reports and error trends with Real User Monitoring. With this feature, you can access:

tools/lint/sources.swiftlint.yml

@@ -25,7 +25,6 @@ only_rules: # we enable lint rules explicitly - only the ones listed below are a
   - empty_xctest_method
   - explicit_top_level_acl
   - first_where
-  - for_where
   - force_cast
   - force_try
   - force_unwrapping

tools/lint/tests.swiftlint.yml

@@ -23,7 +23,6 @@ only_rules: # we enable lint rules explicitly - only the ones listed below are a
   - empty_parentheses_with_trailing_closure
   - empty_xctest_method
   - first_where
-  - for_where
   - function_default_parameter_at_end
   - implicitly_unwrapped_optional
   - last_where