DataDog · ncreated · Jan 20, 2022 · Nov 24, 2021 · Nov 26, 2021 · Nov 29, 2021
@@ -111,6 +111,16 @@
             value = "$(BITRISE_BUILD_URL)"
             isEnabled = "YES">
          </EnvironmentVariable>
+         <EnvironmentVariable
+            key = "DD_ENABLE_STDOUT_INSTRUMENTATION"
+            value = "1"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+         <EnvironmentVariable
+            key = "DD_ENABLE_STDERR_INSTRUMENTATION"
+            value = "1"
+            isEnabled = "YES">
+         </EnvironmentVariable>
       </EnvironmentVariables>
       <CodeCoverageTargets>
          <BuildableReference

@@ -146,6 +146,16 @@
             value = "$(BITRISE_BUILD_URL)"
             isEnabled = "YES">
          </EnvironmentVariable>
+         <EnvironmentVariable
+            key = "DD_ENABLE_STDOUT_INSTRUMENTATION"
+            value = "1"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+         <EnvironmentVariable
+            key = "DD_ENABLE_STDERR_INSTRUMENTATION"
+            value = "1"
+            isEnabled = "YES">
+         </EnvironmentVariable>
       </EnvironmentVariables>
       <Testables>
          <TestableReference

@@ -166,6 +166,16 @@
             value = "$(GIT_CLONE_COMMIT_COMMITER_EMAIL)"
             isEnabled = "YES">
          </EnvironmentVariable>
+         <EnvironmentVariable
+            key = "DD_ENABLE_STDOUT_INSTRUMENTATION"
+            value = "1"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+         <EnvironmentVariable
+            key = "DD_ENABLE_STDERR_INSTRUMENTATION"
+            value = "1"
+            isEnabled = "YES">
+         </EnvironmentVariable>
       </EnvironmentVariables>
       <CodeCoverageTargets>
          <BuildableReference

@@ -105,6 +105,16 @@
             value = "$(BITRISE_BUILD_URL)"
             isEnabled = "YES">
          </EnvironmentVariable>
+         <EnvironmentVariable
+            key = "DD_ENABLE_STDOUT_INSTRUMENTATION"
+            value = "1"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+         <EnvironmentVariable
+            key = "DD_ENABLE_STDERR_INSTRUMENTATION"
+            value = "1"
+            isEnabled = "YES">
+         </EnvironmentVariable>
       </EnvironmentVariables>
       <CodeCoverageTargets>
          <BuildableReference

@@ -151,6 +151,11 @@
             value = "CrashReportingCollectOrSendWithLoggingScenario"
             isEnabled = "NO">
          </EnvironmentVariable>
+         <EnvironmentVariable
+            key = "DD_TEST_SCENARIO_CLASS_NAME"
+            value = "WebViewTrackingScenario"
+            isEnabled = "NO">
+         </EnvironmentVariable>
       </EnvironmentVariables>
    </LaunchAction>
    <ProfileAction

@@ -5,8 +5,8 @@
  */
 
 import UIKit
-import Datadog
 import WebKit
+import Datadog
 
 class DebugWebviewViewController: UIViewController {
     @IBOutlet weak var rumServiceNameTextField: UITextField!
@@ -47,7 +47,7 @@ class DebugWebviewViewController: UIViewController {
 
     private var webviewURL: String {
         guard let text = webviewURLTextField.text, !text.isEmpty else {
-            return  "https://www.datadoghq.com"
+            return "https://datadoghq.dev/browser-sdk-test-playground/webview.html"
         }
         return text
     }
@@ -84,8 +84,12 @@ class WebviewViewController: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
 
-        let configuration = WKWebViewConfiguration()
-        webView = WKWebView(frame: UIScreen.main.bounds, configuration: configuration)
+        let controller = WKUserContentController()
+        controller.trackDatadogEvents(in: [request.url!.host!])
+        let config = WKWebViewConfiguration()
+        config.userContentController = controller
+
+        webView = WKWebView(frame: UIScreen.main.bounds, configuration: config)
         view.addSubview(webView)
     }
 

@@ -0,0 +1,31 @@
+/*
+ * Unless explicitly stated otherwise all files in this repository are licensed under the Apache License Version 2.0.
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
+ * Copyright 2019-2020 Datadog, Inc.
+ */
+
+import UIKit
+import Datadog
+
+private struct WebViewTrackingScenarioPredicate: UIKitRUMViewsPredicate {
+    private let defaultPredicate = DefaultUIKitRUMViewsPredicate()
+
+    func rumView(for viewController: UIViewController) -> RUMView? {
+        if viewController is ShopistWebviewViewController {
+            return nil // do not consider the webview itself as RUM view
+        } else {
+            return defaultPredicate.rumView(for: viewController)
+        }
+    }
+}
+
+final class WebViewTrackingScenario: TestScenario {
+    static var storyboardName: String = "WebViewTrackingScenario"
+
+    func configureSDK(builder: Datadog.Configuration.Builder) {
+        _ = builder
+            .trackUIKitRUMViews(using: WebViewTrackingScenarioPredicate())
+            .enableLogging(true)
+            .enableRUM(true)
+    }
+}
@@ -0,0 +1,43 @@
+/*
+ * Unless explicitly stated otherwise all files in this repository are licensed under the Apache License Version 2.0.
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
+ * Copyright 2019-2020 Datadog, Inc.
+ */
+
+import UIKit
+import WebKit
+import Datadog
+
+class WebViewTrackingFixtureViewController: UIViewController, WKNavigationDelegate {
+    override func viewDidAppear(_ animated: Bool) {
+        super.viewDidAppear(animated)
+
+        // An action sent from native iOS SDK.
+        Global.rum.addUserAction(type: .custom, name: "Native action")
+
+        // Opens a webview configured to pass all its Browser SDK events to native iOS SDK.
+        show(ShopistWebviewViewController(), sender: nil)
+    }
+}
+
+class ShopistWebviewViewController: UIViewController {
+    private let request = URLRequest(url: URL(string: "https://shopist.io")!)
+    private var webView: WKWebView!
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+
+        let controller = WKUserContentController()
+        controller.trackDatadogEvents(in: ["shopist.io"])
+        let config = WKWebViewConfiguration()
+        config.userContentController = controller
+
+        webView = WKWebView(frame: UIScreen.main.bounds, configuration: config)
+        view.addSubview(webView)
+    }
+
+    override func viewDidAppear(_ animated: Bool) {
+        super.viewDidAppear(animated)
+        webView.load(request)
+    }
+}
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Y6W-OH-hqX">
+    <device id="retina6_1" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <scenes>
+        <!--Web View Tracking Fixture View Controller-->
+        <scene sceneID="s0d-6b-0kx">
+            <objects>
+                <viewController id="Y6W-OH-hqX" customClass="WebViewTrackingFixtureViewController" customModule="Example" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="5EZ-qb-Rvc">
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <viewLayoutGuide key="safeArea" id="vDu-zF-Fre"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                    </view>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="Ief-a0-LHa" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="114" y="80"/>
+        </scene>
+    </scenes>
+    <resources>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
+    </resources>
+</document>
@@ -33,21 +33,9 @@
   },
   "testTargets" : [
     {
-      "skippedTests" : [
-        "IntegrationTests",
-        "LoggingScenarioTests",
-        "RUMManualInstrumentationScenarioTests",
-        "RUMMobileVitalsScenarioTests",
-        "RUMModalViewsScenarioTests",
-        "RUMNavigationControllerScenarioTests",
-        "RUMResourcesScenarioTests",
-        "RUMScrubbingScenarioTests",
-        "RUMSwiftUIScenarioTests",
-        "RUMTabBarControllerScenarioTests",
-        "RUMTapActionScenarioTests",
-        "TracingManualInstrumentationScenarioTests",
-        "TracingURLSessionScenarioTests",
-        "TrackingConsentScenarioTests"
+      "selectedTests" : [
+        "CrashReportingWithLoggingScenarioTests\/testCrashReportingCollectOrSendWithLoggingScenario()",
+        "CrashReportingWithRUMScenarioTests\/testCrashReportingCollectOrSendWithRUMScenario()"
       ],
       "target" : {
         "containerPath" : "container:Datadog.xcodeproj",

@@ -4,6 +4,68 @@
       "id" : "D87CA41D-8EBB-4809-AC70-E3B8317FAAC7",
       "name" : "TSAN",
       "options" : {
+        "environmentVariableEntries" : [
+          {
+            "key" : "DD_TEST_RUNNER",
+            "value" : "$(DD_TEST_RUNNER)"
+          },
+          {
+            "key" : "DATADOG_CLIENT_TOKEN",
+            "value" : "$(DD_SDK_SWIFT_TESTING_CLIENT_TOKEN)"
+          },
+          {
+            "key" : "DD_ENV",
+            "value" : "$(DD_SDK_SWIFT_TESTING_ENV)"
+          },
+          {
+            "key" : "DD_SERVICE",
+            "value" : "$(DD_SDK_SWIFT_TESTING_SERVICE)"
+          },
+          {
+            "key" : "DD_DISABLE_SDKIOS_INTEGRATION",
+            "value" : "1"
+          },
+          {
+            "key" : "DD_DISABLE_HEADERS_INJECTION",
+            "value" : "1"
+          },
+          {
+            "key" : "DD_ENABLE_RECORD_PAYLOAD",
+            "value" : "1"
+          },
+          {
+            "key" : "SRCROOT",
+            "value" : "$(SRCROOT)"
+          },
+          {
+            "key" : "BITRISE_SOURCE_DIR",
+            "value" : "$(BITRISE_SOURCE_DIR)"
+          },
+          {
+            "key" : "BITRISE_TRIGGERED_WORKFLOW_ID",
+            "value" : "$(BITRISE_TRIGGERED_WORKFLOW_ID)"
+          },
+          {
+            "key" : "BITRISE_BUILD_SLUG",
+            "value" : "$(BITRISE_BUILD_SLUG)"
+          },
+          {
+            "key" : "BITRISE_BUILD_NUMBER",
+            "value" : "$(BITRISE_BUILD_NUMBER)"
+          },
+          {
+            "key" : "BITRISE_BUILD_URL",
+            "value" : "$(BITRISE_BUILD_URL)"
+          },
+          {
+            "key" : "DD_ENABLE_STDOUT_INSTRUMENTATION",
+            "value" : "1"
+          },
+          {
+            "key" : "DD_ENABLE_STDERR_INSTRUMENTATION",
+            "value" : "1"
+          }
+        ],
         "threadSanitizerEnabled" : true
       }
     }

@@ -1,7 +1,7 @@
 all: dependencies xcodeproj-httpservermock templates
 
 # The release version of `dd-sdk-swift-testing` to use for tests instrumentation.
-DD_SDK_SWIFT_TESTING_VERSION = 1.0.3-beta.1
+DD_SDK_SWIFT_TESTING_VERSION = 1.1.0
 
 define DD_SDK_TESTING_XCCONFIG_CI
 FRAMEWORK_SEARCH_PATHS=$$(inherited) $$(SRCROOT)/../instrumented-tests/DatadogSDKTesting.xcframework/ios-arm64_x86_64-simulator/\n
@@ -17,8 +17,9 @@ export DD_SDK_TESTING_XCCONFIG_CI
 define DD_SDK_BASE_XCCONFIG
 // Active compilation conditions - only enabled on local machine:\n
 // - DD_SDK_ENABLE_INTERNAL_MONITORING - enables Internal Monitoring APIs\n
+// - DD_SDK_ENABLE_EXPERIMENTAL_APIS - enables APIs which are not available in released version of the SDK\n
 // - DD_SDK_COMPILED_FOR_TESTING - conditions the SDK code compiled for testing\n
-SWIFT_ACTIVE_COMPILATION_CONDITIONS = $(inherited) DD_SDK_ENABLE_INTERNAL_MONITORING DD_SDK_COMPILED_FOR_TESTING\n
+SWIFT_ACTIVE_COMPILATION_CONDITIONS = $(inherited) DD_SDK_ENABLE_INTERNAL_MONITORING DD_SDK_ENABLE_EXPERIMENTAL_APIS DD_SDK_COMPILED_FOR_TESTING\n
 \n
 // To build only active architecture for all configurations. This gives us ~10% build time gain\n
 // in targets which do not use 'Debug' configuration.\n