Release 2.1.0

BenchmarkTests/DataUpload/DataUploaderBenchmarkTests.swift

@@ -27,7 +27,7 @@ class DataUploaderBenchmarkTests: BenchmarkTests {
     /// `DataUploader` leaves no memory footprint (the memory peak after upload is less or equal `0kB`).
     func testUploadingDataToServer_leavesNoMemoryFootprint() throws {
         let dataUploader = DataUploader(
-            httpClient: HTTPClient(),
+            httpClient: URLSessionClient(),
             requestBuilder: FeatureRequestBuilderMock()
         )
 

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Unreleased
 
+- [BUGFIX] Manual trace injection APIs are not available in DatadogTrace. See [#1415][].
+- [BUGFIX] Fix session replay uploads to AP1 site. See [#1418][].
+- [BUGFIX] Allow instantiating custom instance of the SDK after default one. See [#1413][].
+- [BUGFIX] Do not propagate attributes from Errors and LongTasks to Views.
+- [IMPROVEMENT] Upgrade to PLCrashReporter 1.11.1.
+- [FEATURE] Report session sample rate to the backend with RUM events. See [#1410][]
+- [IMPROVEMENT] Expose Session Replay to Objective-C. see [#1419][]
+
 # 2.0.0 / 31-07-2023
 
 Release `2.0` introduces breaking changes. Follow the [Migration Guide](MIGRATION.md) to upgrade from `1.x` versions.
@@ -488,6 +496,11 @@ Release `2.0` introduces breaking changes. Follow the [Migration Guide](MIGRATIO
 [#1331]: https://github.com/DataDog/dd-sdk-ios/pull/1331
 [#1328]: https://github.com/DataDog/dd-sdk-ios/pull/1328
 [#1355]: https://github.com/DataDog/dd-sdk-ios/pull/1355
+[#1410]: https://github.com/DataDog/dd-sdk-ios/pull/1410
+[#1413]: https://github.com/DataDog/dd-sdk-ios/pull/1413
+[#1415]: https://github.com/DataDog/dd-sdk-ios/pull/1415
+[#1418]: https://github.com/DataDog/dd-sdk-ios/pull/1418
+[#1419]: https://github.com/DataDog/dd-sdk-ios/pull/1419
 [@00fa9a]: https://github.com/00FA9A
 [@britton-earnin]: https://github.com/Britton-Earnin
 [@hengyu]: https://github.com/Hengyu

Cartfile

@@ -1 +1 @@
-github "microsoft/plcrashreporter" ~> 1.11.0
+github "microsoft/plcrashreporter" ~> 1.11.1

Cartfile.resolved

@@ -1 +1 @@
-github "microsoft/plcrashreporter" "1.11.0"
+github "microsoft/plcrashreporter" "1.11.1"

Datadog/E2ETests/Tracing/TracerE2ETests.swift

@@ -5,7 +5,6 @@
  */
 
 import DatadogCore
-import DatadogInternal
 import DatadogTrace
 
 class TracerE2ETests: E2ETests {

Datadog/Example/Base.lproj/Main iOS.storyboard

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19455" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="gra-d4-cht">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="gra-d4-cht">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19454"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21679"/>
         <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"/>
@@ -65,8 +65,28 @@
                                             <segue destination="FaI-gu-eql" kind="show" id="ePB-Ph-XzE"/>
                                         </connections>
                                     </tableViewCell>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="M3j-VO-N1P" style="IBUITableViewCellStyleDefault" id="F5A-gJ-7Vm">
+                                        <rect key="frame" x="0.0" y="137" width="414" height="43.5"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="F5A-gJ-7Vm" id="Y3A-pt-TCA">
+                                            <rect key="frame" x="0.0" y="0.0" width="414" height="43.5"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Trace Injection (manual)" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="M3j-VO-N1P">
+                                                    <rect key="frame" x="20" y="0.0" width="374" height="43.5"/>
+                                                    <autoresizingMask key="autoresizingMask"/>
+                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleSubhead"/>
+                                                    <nil key="textColor"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                            </subviews>
+                                        </tableViewCellContentView>
+                                        <connections>
+                                            <segue destination="1Dj-vX-hFb" kind="show" id="IrQ-UG-cMw"/>
+                                        </connections>
+                                    </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="yCu-pq-IYL" style="IBUITableViewCellStyleDefault" id="3G8-Wa-fSQ">
-                                        <rect key="frame" x="0.0" y="131.5" width="414" height="43.5"/>
+                                        <rect key="frame" x="0.0" y="180.5" width="414" height="43.5"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="3G8-Wa-fSQ" id="7IJ-XI-RAR">
                                             <rect key="frame" x="0.0" y="0.0" width="414" height="43.5"/>
@@ -1662,6 +1682,34 @@
             </objects>
             <point key="canvasLocation" x="1419" y="1175"/>
         </scene>
+        <!--Debug Manual Trace Injection View Controller-->
+        <scene sceneID="d34-e7-Qn8">
+            <objects>
+                <viewController id="1Dj-vX-hFb" customClass="DebugManualTraceInjectionViewController" customModule="Example" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="h6o-Ng-hRs">
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="This screen requires iO14+" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pe0-Ro-rxm">
+                                <rect key="frame" x="105" y="437.5" width="204" height="21"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                        </subviews>
+                        <viewLayoutGuide key="safeArea" id="LmF-Gg-KKf"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                        <constraints>
+                            <constraint firstItem="pe0-Ro-rxm" firstAttribute="centerX" secondItem="h6o-Ng-hRs" secondAttribute="centerX" id="WU4-aG-e4N"/>
+                            <constraint firstItem="pe0-Ro-rxm" firstAttribute="centerY" secondItem="h6o-Ng-hRs" secondAttribute="centerY" id="cB7-WP-Qma"/>
+                        </constraints>
+                    </view>
+                    <navigationItem key="navigationItem" id="yjy-W3-IxO"/>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="R6e-tl-J7Q" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="2201" y="1175"/>
+        </scene>
     </scenes>
     <resources>
         <systemColor name="secondaryLabelColor">

Datadog/Example/Debugging/DebugManualTraceInjectionViewController.swift

@@ -0,0 +1,153 @@
+/*
+ * 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-Present Datadog, Inc.
+ */
+
+import SwiftUI
+import DatadogTrace
+
+@available(iOS 14, *)
+internal class DebugManualTraceInjectionViewController: UIHostingController<DebugManualTraceInjectionView> {
+    required init?(coder aDecoder: NSCoder) {
+        super.init(coder: aDecoder, rootView: DebugManualTraceInjectionView())
+    }
+}
+
+private var currentSession: URLSession? = nil
+
+@available(iOS 14.0, *)
+internal struct DebugManualTraceInjectionView: View {
+    enum TraceHeaderType: String, CaseIterable {
+        case datadog = "Datadog"
+        case w3c = "W3C"
+        case b3Single = "B3-Single"
+        case b3Multiple = "B3-Multiple"
+    }
+
+    @State private var spanName = "network request"
+    @State private var requestURL = "http://127.0.0.1:8000"
+    @State private var selectedTraceHeaderType: TraceHeaderType = .datadog
+    @State private var sampleRate: Float = 100.0
+    @State private var isRequestPending = false
+
+    private let session: URLSession = URLSession(
+        configuration: .ephemeral,
+        delegate: DDURLSessionDelegate(),
+        delegateQueue: nil
+    )
+
+    var body: some View {
+        let isButtonDisabled = isRequestPending || spanName.isEmpty || requestURL.isEmpty
+
+        VStack() {
+            VStack(spacing: 8) {
+                Text("Trace injection")
+                    .font(.caption.weight(.bold))
+                    .frame(maxWidth: .infinity, alignment: .leading)
+
+                Text("After tapping \"SEND REQUEST\", a POST request will be sent to the given URL. The request will be traced using the chosen tracing header type and sample rate. A span with specified name will be sent to Datadog.")
+                    .font(.caption.weight(.light))
+                    .frame(maxWidth: .infinity, alignment: .leading)
+            }
+            .padding()
+
+            Form {
+                Section(header: Text("Traced URL:")) {
+                    TextField("", text: $requestURL)
+                }
+                Section(header: Text("Span name:")) {
+                    TextField("", text: $spanName)
+                }
+                Picker("Trace header type:", selection: $selectedTraceHeaderType) {
+                    ForEach(TraceHeaderType.allCases, id: \.self) { headerType in
+                        Text(headerType.rawValue)
+                    }
+                }
+                .pickerStyle(.inline)
+                Section(header: Text("Trace sample Rate")) {
+                    Slider(
+                        value: $sampleRate,
+                        in: 0...100, step: 1,
+                        minimumValueLabel: Text("0"),
+                        maximumValueLabel: Text("100")
+                    ) {
+                        Text("Sample Rate")
+                    }
+                }
+            }
+
+            Spacer()
+
+            Button(action: { prepareAndSendRequest() }) {
+                Text("SEND REQUEST")
+                    .fontWeight(.bold)
+                    .foregroundColor(.white)
+            }
+            .frame(maxWidth: .infinity)
+            .padding()
+            .background(isButtonDisabled ? Color.gray : Color.datadogPurple)
+            .cornerRadius(10)
+            .disabled(isButtonDisabled)
+            .padding(.horizontal, 8)
+            .padding(.bottom, 30)
+        }
+    }
+
+    private func prepareAndSendRequest() {
+        guard let url = URL(string: requestURL) else {
+            print("🔥 POST Request not sent - invalid url: \(requestURL)")
+            return
+        }
+
+        var request = URLRequest(url: url)
+        request.httpMethod = "POST"
+
+        let span = Tracer.shared().startRootSpan(operationName: spanName)
+
+        switch selectedTraceHeaderType {
+        case .datadog:
+            let writer = HTTPHeadersWriter(sampleRate: sampleRate)
+            Tracer.shared().inject(spanContext: span.context, writer: writer)
+            writer.traceHeaderFields.forEach { request.setValue($0.value, forHTTPHeaderField: $0.key) }
+        case .w3c:
+            let writer = W3CHTTPHeadersWriter(sampleRate: sampleRate)
+            Tracer.shared().inject(spanContext: span.context, writer: writer)
+            writer.traceHeaderFields.forEach { request.setValue($0.value, forHTTPHeaderField: $0.key) }
+        case .b3Single:
+            let writer = B3HTTPHeadersWriter(sampleRate: sampleRate, injectEncoding: .single)
+            Tracer.shared().inject(spanContext: span.context, writer: writer)
+            writer.traceHeaderFields.forEach { request.setValue($0.value, forHTTPHeaderField: $0.key) }
+        case .b3Multiple:
+            let writer = B3HTTPHeadersWriter(sampleRate: sampleRate, injectEncoding: .multiple)
+            Tracer.shared().inject(spanContext: span.context, writer: writer)
+            writer.traceHeaderFields.forEach { request.setValue($0.value, forHTTPHeaderField: $0.key) }
+        }
+
+        send(request: request) {
+            span.finish()
+            print("✅ Request sent to \(requestURL)")
+        }
+    }
+
+    private func send(request: URLRequest, completion: @escaping () -> Void) {
+        isRequestPending = true
+        let task = session.dataTask(with: request) { _, _, _ in
+            completion()
+            DispatchQueue.main.async { self.isRequestPending = false }
+        }
+        task.resume()
+    }
+}
+
+// MARK - Preview
+
+@available(iOS 14.0, *)
+
+struct DebugTraceInjectionView_Previews: PreviewProvider {
+    static var previews: some View {
+        NavigationView {
+            DebugManualTraceInjectionView()
+        }
+    }
+}

Datadog/Example/Debugging/DebugWebviewViewController.swift

@@ -6,7 +6,6 @@
 
 import UIKit
 import WebKit
-import DatadogInternal
 import DatadogRUM
 import DatadogWebViewTracking
 

Datadog/Example/Utils/ConsoleOutputInterceptor.swift

@@ -6,7 +6,6 @@
 
 #if DEBUG
 
-import DatadogInternal
 import UIKit
 
 class ConsoleOutputInterceptor {

Datadog/IntegrationUnitTests/Public/Datadog+MultipleInstancesIntegrationTests.swift

@@ -0,0 +1,100 @@
+/*
+ * 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-Present Datadog, Inc.
+ */
+
+import XCTest
+import TestUtilities
+@testable import DatadogCore
+import DatadogInternal
+import DatadogLogs
+
+class Datadog_MultipleInstancesIntegrationTests: XCTestCase {
+    /// The configuraiton of default instance of SDK.
+    private var defaultInstanceConfig = Datadog.Configuration(clientToken: "main-token", env: "default-env")
+    /// The configuraiton of custom instance of SDK.
+    private var customInstanceConfig = Datadog.Configuration(clientToken: "custom-token", env: "custom-env")
+
+    override func setUp() {
+        super.setUp()
+        CreateTemporaryDirectory()
+
+        // Root system directory for both instances:
+        let systemDirectory = Directory(url: temporaryDirectory)
+        defaultInstanceConfig.systemDirectory = { systemDirectory }
+        customInstanceConfig.systemDirectory = { systemDirectory }
+    }
+
+    override func tearDown() {
+        DeleteTemporaryDirectory()
+        super.tearDown()
+    }
+
+    func testGivenTwoInstancesOfSDK_whenCollectingLogs_thenEachSDKUploadsItsOwnData() throws {
+        let customInstanceName = "custom"
+        let numberOfLogs = 10
+        let defaultHTTPClient = HTTPClientMock(responseCode: 200)
+        let customHTTPClient = HTTPClientMock(responseCode: 200)
+        defaultInstanceConfig.httpClientFactory = { _ in defaultHTTPClient }
+        customInstanceConfig.httpClientFactory = { _ in customHTTPClient }
+        defaultInstanceConfig.bundle = .mockWith(bundleIdentifier: "com.bundle.default", CFBundleShortVersionString: "1.0-default")
+        customInstanceConfig.bundle = .mockWith(bundleIdentifier: "com.bundle.custom", CFBundleShortVersionString: "1.0-custom")
+
+        // Given
+        Datadog.initialize(with: defaultInstanceConfig, trackingConsent: .granted)
+        Datadog.initialize(with: customInstanceConfig, trackingConsent: .granted, instanceName: customInstanceName)
+
+        Logs.enable(with: .init())
+        Logs.enable(with: .init(), in: Datadog.sdkInstance(named: customInstanceName))
+
+        let defaultLogger = Logger.create()
+        let customLogger = Logger.create(in: Datadog.sdkInstance(named: customInstanceName))
+
+        // When
+        for _ in 0..<numberOfLogs {
+            defaultLogger.info("Default SDK log")
+            customLogger.info("Custom SDK log")
+        }
+
+        // Then
+        Datadog.flushAndDeinitialize()
+        Datadog.flushAndDeinitialize(instanceName: customInstanceName)
+
+        let defaultInstanceRequests = defaultHTTPClient.requestsSent()
+        let customInstanceRequests = customHTTPClient.requestsSent()
+        XCTAssertGreaterThan(defaultInstanceRequests.count, 0, "Default instance should send some data")
+        XCTAssertGreaterThan(customInstanceRequests.count, 0, "Custom instance should send some data")
+
+        defaultInstanceRequests.forEach { request in
+            XCTAssertEqual(
+                request.value(forHTTPHeaderField: URLRequestBuilder.HTTPHeader.ddAPIKeyHeaderField),
+                defaultInstanceConfig.clientToken,
+                "Default instance should authenticate data using '\(defaultInstanceConfig.clientToken)' client token"
+            )
+        }
+        customInstanceRequests.forEach { request in
+            XCTAssertEqual(
+                request.value(forHTTPHeaderField: URLRequestBuilder.HTTPHeader.ddAPIKeyHeaderField),
+                customInstanceConfig.clientToken,
+                "Custom instance should authenticate data using '\(customInstanceConfig.clientToken)' client token"
+            )
+        }
+
+        let defaultLogs = try defaultInstanceRequests.flatMap { try LogMatcher.fromLogsRequest($0) }
+        let customLogs = try customInstanceRequests.flatMap { try LogMatcher.fromLogsRequest($0) }
+
+        XCTAssertEqual(defaultLogs.count, numberOfLogs, "Default instance should send \(numberOfLogs) logs")
+        XCTAssertEqual(customLogs.count, numberOfLogs, "Custom instance should send \(numberOfLogs) logs")
+        defaultLogs.forEach { log in
+            log.assertService(equals: "com.bundle.default")
+            log.assertMessage(equals: "Default SDK log")
+            log.assertTags(equal: ["env:default-env", "version:1.0-default"])
+        }
+        customLogs.forEach { log in
+            log.assertService(equals: "com.bundle.custom")
+            log.assertMessage(equals: "Custom SDK log")
+            log.assertTags(equal: ["env:custom-env", "version:1.0-custom"])
+        }
+    }
+}