Merge pull request #1622 from DataDog/release/2.6.0

Release 2.6.0

.github/CODEOWNERS

@@ -1,6 +1,6 @@
 # Global code owners - RUM Mobile Team
 
-* @DataDog/rum-mobile
+* @DataDog/rum-mobile @DataDog/rum-mobile-ios
 
 ## Docs
 

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,58 @@
+---
+name: Bug report
+about: Create a report to help us improve the SDK.
+title: ''
+labels: 'bug'
+assignees: ''
+
+---
+
+### Describe the bug
+A clear and concise description of what the bug is.
+
+### Reproduction
+
+Provide a self-contained, concise snippet of code that can be used to reproduce the issue.
+For more complex issues provide a repo with the smallest sample that reproduces the bug.
+
+Avoid including business logic or unrelated code, it makes diagnosis more difficult.
+The code sample should be an SSCCE. See http://sscce.org/ for details. In short, please provide a code sample that we can copy/paste, run and reproduce.
+
+Do not share secrets or sensitive information in the code sample.
+
+### Expected behavior
+A clear and concise description of what you expected to happen.
+
+---
+
+#### Datadog SDK version:
+
+_Which version of the Datadog SDK causes this problem? e.g. `2.5.0`_
+
+#### Last working Datadog SDK version:
+
+_What is the last Datadog SDK version where this problem didn't occur? e.g. `1.1.0`_
+
+#### Dependency Manager:
+
+_Which dependency manager do you use? e.g. Cocoapods / Carthage / SPM / ..._
+
+#### Other toolset:
+
+_Do you use additional tools with your dependency manager? e.g. [CarthageCache](https://github.com/Wolox/carthage_cache)_
+
+#### Xcode version:
+
+_e.g. `Xcode 11.5 (11E608c)`_
+
+#### Swift version:
+
+_e.g. `5.1`_
+
+#### Deployment Target:
+
+_What is the Deployment Target of your app? e.g. `iOS 12`, `iPhone` + `iPad`_
+
+#### macOS version:
+
+_e.g. `macOS Catalina 10.15.5 (19F96)`_

.github/ISSUE_TEMPLATE/compilation_issue.md

@@ -11,11 +11,21 @@ assignees: ''
 
 📝 Give us the error message you receive, describe the problem and answer the questions.
 
+### Reproduction
+
+Provide a self-contained, concise snippet of code that can be used to reproduce the issue.
+For more complex issues provide a repo with the smallest sample that reproduces the bug.
+
+Avoid including business logic or unrelated code, it makes diagnosis more difficult.
+The code sample should be an SSCCE. See http://sscce.org/ for details. In short, please provide a code sample that we can copy/paste, run and reproduce.
+
+Do not share secrets or sensitive information in the code sample.
+
 ---
 
 #### Datadog SDK version:
 
-_Which version of the Datadog SDK causes this problem? e.g. `1.2.0`_
+_Which version of the Datadog SDK causes this problem? e.g. `2.5.0`_
 
 #### Last working Datadog SDK version:
 

.github/ISSUE_TEMPLATE/crash_report.md

@@ -11,6 +11,16 @@ assignees: ''
 
 📝 Give us the crash report or stack trace, describe the problem in details and answer the questions.
 
+### Reproduction
+
+Provide a self-contained, concise snippet of code that can be used to reproduce the issue.
+For more complex issues provide a repo with the smallest sample that reproduces the bug.
+
+Avoid including business logic or unrelated code, it makes diagnosis more difficult.
+The code sample should be an SSCCE. See http://sscce.org/ for details. In short, please provide a code sample that we can copy/paste, run and reproduce.
+
+Do not share secrets or sensitive information in the code sample.
+
 ---
 
 #### Datadog SDK versions:

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,21 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: 'feature'
+assignees: ''
+
+---
+
+### Is your feature request related to a problem? Please describe.
+
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+### Describe the solution you'd like
+A clear and concise description of what you want to happen.
+
+### Describe alternatives you've considered
+A clear and concise description of any alternative solutions or features you've considered.
+
+### Additional context
+Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/other.md

@@ -2,6 +2,7 @@
 name: Other
 about: Noticed a bug, having a question or a feature request?
 title: ''
+labels: ''
 assignees: ''
 
 ---

BenchmarkTests/DataStorage/LoggingStorageBenchmarkTests.swift

@@ -71,7 +71,7 @@ class LoggingStorageBenchmarkTests: XCTestCase {
 
         measureMetrics([.wallClockTime], automaticallyStartMeasuring: false) {
             self.startMeasuring()
-            let batch = reader.readNextBatch()
+            let batch = reader.readNextBatches(1).first
             self.stopMeasuring()
 
             XCTAssertNotNil(batch, "Not enough batch files were created for this benchmark.")
@@ -101,6 +101,7 @@ class LoggingStorageBenchmarkTests: XCTestCase {
             threadName: "main",
             applicationVersion: "0.0.0",
             applicationBuildNumber: "0",
+            buildId: "0",
             dd: .init(device: .init(architecture: "testArch")),
             os: .init(
                 name: "OS",

BenchmarkTests/DataStorage/RUMStorageBenchmarkTests.swift

@@ -71,7 +71,7 @@ class RUMStorageBenchmarkTests: XCTestCase {
 
         measureMetrics([.wallClockTime], automaticallyStartMeasuring: false) {
             self.startMeasuring()
-            let batch = reader.readNextBatch()
+            let batch = reader.readNextBatches(1).first
             self.stopMeasuring()
 
             XCTAssertNotNil(batch, "Not enough batch files were created for this benchmark.")
@@ -82,3 +82,9 @@ class RUMStorageBenchmarkTests: XCTestCase {
         }
     }
 }
+
+extension Reader {
+    func readNextBatches(_ limit: Int = .max) -> [Batch] {
+        return readFiles(limit: limit).compactMap { readBatch(from: $0) }
+    }
+}

BenchmarkTests/DataStorage/TracingStorageBenchmarkTests.swift

@@ -71,7 +71,7 @@ class TracingStorageBenchmarkTests: XCTestCase {
 
         measureMetrics([.wallClockTime], automaticallyStartMeasuring: false) {
             self.startMeasuring()
-            let batch = reader.readNextBatch()
+            let batch = reader.readNextBatches(1).first
             self.stopMeasuring()
 
             XCTAssertNotNil(batch, "Not enough batch files were created for this benchmark.")

CHANGELOG.md

@@ -1,9 +1,17 @@
 # Unreleased
 
+# 2.6.0 / 09-01-2024
+- [FEATURE] Add `currentSessionID(completion:)` accessor to access the current session ID.
+- [FEATURE] Add `BatchProcessingLevel` configuration allowing to process more batches within single read/upload cycle. See [#1531][]
+- [FIX] Use `currentRequest` instead `originalRequest` for URLSession request interception
+- [FIX] Remove weak `UIViewController` references. See [#1597][]
+
 # 2.5.1 / 20-12-2023
 
 - [BUGFIX] Fix `view.time_spent` in RUM view events. See [#1596][]
 
+- [FEATURE] Start RUM session on RUM init. See [#1594][]
+
 # 2.5.0 / 08-11-2023
 
 - [BUGFIX] Optimize Session Replay diffing algorithm. See [#1524][]
@@ -560,8 +568,11 @@ Release `2.0` introduces breaking changes. Follow the [Migration Guide](MIGRATIO
 [#1524]: https://github.com/DataDog/dd-sdk-ios/pull/1524
 [#1529]: https://github.com/DataDog/dd-sdk-ios/pull/1529
 [#1533]: https://github.com/DataDog/dd-sdk-ios/pull/1533
+[#1594]: https://github.com/DataDog/dd-sdk-ios/pull/1594
 [#1536]: https://github.com/DataDog/dd-sdk-ios/pull/1536
+[#1531]: https://github.com/DataDog/dd-sdk-ios/pull/1531
 [#1596]: https://github.com/DataDog/dd-sdk-ios/pull/1596
+[#1597]: https://github.com/DataDog/dd-sdk-ios/pull/1597
 [@00fa9a]: https://github.com/00FA9A
 [@britton-earnin]: https://github.com/Britton-Earnin
 [@hengyu]: https://github.com/Hengyu