Merge pull request #2263 from DataDog/release/2.26.0

dd-mergequeue[bot] · maxep · web-flow · commit 868b6007db32 · 2025-04-10T12:21:59.000Z
Release `2.26.0`

Co-authored-by: maxep &lt;maxime.epain@datadoghq.com&gt;
Co-authored-by: dd-mergequeue[bot] &lt;121105855+dd-mergequeue[bot]@users.noreply.github.com&gt;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,16 @@
+# Unreleased
+
+# 2.26.0 / 10-04-2025
+
+- [FIX] Fix Fatal App Hang Duplicates. See [#2260][]
+
 # 2.25.0 / 03-04-2025
 
 - [FEATURE] Calculate Hang rate and Hitch rate in RUM. See [#2234][]
 - [FIX] Fixed Swift 6.0.2 compatibility issue with `DatadogCrashReporting` framework. See [#2251][]
 - [IMPROVEMENT] Refine errors printed from `clearAllData()`. See [#2240][]
 - [IMPROVEMENT] Simplify host sanitizer logic. See [#2223][]
+- [FIX] Fix view drop in SwiftUI modal navigation. See [#2236][]
 
 # 2.24.1 / 31-03-2025
 
@@ -856,6 +863,8 @@ Release `2.0` introduces breaking changes. Follow the [Migration Guide](MIGRATIO
 [#2240]: https://github.com/DataDog/dd-sdk-ios/pull/2240
 [#2223]: https://github.com/DataDog/dd-sdk-ios/pull/2223
 [#2234]: https://github.com/DataDog/dd-sdk-ios/pull/2234
+[#2236]: https://github.com/DataDog/dd-sdk-ios/pull/2236
+[#2260]: https://github.com/DataDog/dd-sdk-ios/pull/2260
 [@00fa9a]: https://github.com/00FA9A
 [@britton-earnin]: https://github.com/Britton-Earnin
 [@hengyu]: https://github.com/Hengyu
diff --git a/DatadogAlamofireExtension.podspec b/DatadogAlamofireExtension.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "DatadogAlamofireExtension"
-  s.version      = "2.25.0"
+  s.version      = "2.26.0"
   s.summary      = "An Official Extensions of Datadog Swift SDK for Alamofire."
   s.description  = <<-DESC
                    The DatadogAlamofireExtension pod is deprecated and will no longer be maintained.
diff --git a/DatadogCore.podspec b/DatadogCore.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "DatadogCore"
-  s.version      = "2.25.0"
+  s.version      = "2.26.0"
   s.summary      = "Official Datadog Swift SDK for iOS."
   
   s.homepage     = "https://www.datadoghq.com"
diff --git a/DatadogCore/Sources/Versioning.swift b/DatadogCore/Sources/Versioning.swift
@@ -1,3 +1,3 @@
 // GENERATED FILE: Do not edit directly
 
-internal let __sdkVersion = "2.25.0"
+internal let __sdkVersion = "2.26.0"
diff --git a/DatadogCrashReporting.podspec b/DatadogCrashReporting.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "DatadogCrashReporting"
-  s.version      = "2.25.0"
+  s.version      = "2.26.0"
   s.summary      = "Official Datadog Crash Reporting SDK for iOS."
 
   s.homepage     = "https://www.datadoghq.com"
diff --git a/DatadogInternal.podspec b/DatadogInternal.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "DatadogInternal"
-  s.version      = "2.25.0"
+  s.version      = "2.26.0"
   s.summary      = "Datadog Internal Package. This module is not for public use."
 
   s.homepage     = "https://www.datadoghq.com"
diff --git a/DatadogLogs.podspec b/DatadogLogs.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "DatadogLogs"
-  s.version      = "2.25.0"
+  s.version      = "2.26.0"
   s.summary      = "Datadog Logs Module."
 
   s.homepage     = "https://www.datadoghq.com"
diff --git a/DatadogObjc.podspec b/DatadogObjc.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "DatadogObjc"
-  s.version      = "2.25.0"
+  s.version      = "2.26.0"
   s.summary      = "Official Datadog Objective-C SDK for iOS."
 
   s.homepage     = "https://www.datadoghq.com"
diff --git a/DatadogRUM.podspec b/DatadogRUM.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "DatadogRUM"
-  s.version      = "2.25.0"
+  s.version      = "2.26.0"
   s.summary      = "Datadog Real User Monitoring Module."
 
   s.homepage     = "https://www.datadoghq.com"
diff --git a/DatadogRUM/Sources/Instrumentation/AppHangs/FatalAppHangsHandler.swift b/DatadogRUM/Sources/Instrumentation/AppHangs/FatalAppHangsHandler.swift
@@ -61,6 +61,7 @@ internal final class FatalAppHangsHandler {
     }
 
     func reportFatalAppHangIfFound() {
+        // Report pending app hang
         featureScope.rumDataStore.value(forKey: .fatalAppHangKey) { [weak self] (fatalHang: FatalAppHang?) in
             guard let fatalHang = fatalHang else {
                 DD.logger.debug("No pending App Hang found")
@@ -71,6 +72,9 @@ internal final class FatalAppHangsHandler {
             }
             self?.send(fatalHang: fatalHang)
         }
+
+        // Remove pending app hang
+        featureScope.rumDataStore.removeValue(forKey: .fatalAppHangKey)
     }
 
     private func send(fatalHang: FatalAppHang) {
diff --git a/DatadogRUM/Tests/Instrumentation/AppHangs/AppHangsMonitorTests.swift b/DatadogRUM/Tests/Instrumentation/AppHangs/AppHangsMonitorTests.swift
@@ -196,6 +196,7 @@ class AppHangsMonitorTests: XCTestCase {
         XCTAssertEqual(featureScope.eventsWritten.count, 2, "It must send both RUM error and RUM view")
         XCTAssertEqual(featureScope.eventsWritten(ofType: RUMErrorEvent.self).count, 1)
         XCTAssertEqual(featureScope.eventsWritten(ofType: RUMViewEvent.self).count, 1)
+        XCTAssertNil(featureScope.dataStoreMock.value(forKey: RUMDataStore.Key.fatalAppHangKey.rawValue))
     }
 
     func testGivenPendingHangStartedMoreThan4HoursAgo_whenStartedInAnotherProcess_itSendsOnlyRUMError() throws {
@@ -235,6 +236,7 @@ class AppHangsMonitorTests: XCTestCase {
 
         XCTAssertEqual(featureScope.eventsWritten.count, 1, "It must send only RUM error")
         XCTAssertEqual(featureScope.eventsWritten(ofType: RUMErrorEvent.self).count, 1)
+        XCTAssertNil(featureScope.dataStoreMock.value(forKey: RUMDataStore.Key.fatalAppHangKey.rawValue))
     }
 
     func testGivenPendingHangStartedWithPendingOrNotGrantedConsent_whenStartedInAnotherProcess_itSendsNoEvent() throws {
@@ -272,6 +274,7 @@ class AppHangsMonitorTests: XCTestCase {
         )
 
         XCTAssertEqual(featureScope.eventsWritten.count, 0, "It must send no event")
+        XCTAssertNil(featureScope.dataStoreMock.value(forKey: RUMDataStore.Key.fatalAppHangKey.rawValue))
     }
 
     // MARK: - Fatal App Hangs - Testing Uploaded Data
diff --git a/DatadogSessionReplay.podspec b/DatadogSessionReplay.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "DatadogSessionReplay"
-  s.version      = "2.25.0"
+  s.version      = "2.26.0"
   s.summary      = "Official Datadog Session Replay SDK for iOS."
 
   s.homepage     = "https://www.datadoghq.com"
diff --git a/DatadogTrace.podspec b/DatadogTrace.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "DatadogTrace"
-  s.version      = "2.25.0"
+  s.version      = "2.26.0"
   s.summary      = "Datadog Trace Module."
 
   s.homepage     = "https://www.datadoghq.com"
diff --git a/DatadogWebViewTracking.podspec b/DatadogWebViewTracking.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "DatadogWebViewTracking"
-  s.version      = "2.25.0"
+  s.version      = "2.26.0"
   s.summary      = "Datadog WebView Tracking Module."
 
   s.homepage     = "https://www.datadoghq.com"
diff --git a/TestUtilities.podspec b/TestUtilities.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "TestUtilities"
-  s.version      = "2.25.0"
+  s.version      = "2.26.0"
   s.summary      = "Datadog Testing Utilities. This module is for internal testing and should not be published."
 
   s.homepage     = "https://www.datadoghq.com"

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`// GENERATED FILE: Do not edit directly`
`2`	`2`
`3`		`-internal let __sdkVersion = "2.25.0"`
	`3`	`+internal let __sdkVersion = "2.26.0"`
Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,7 @@ internal final class FatalAppHangsHandler {`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`func reportFatalAppHangIfFound() {`
	`64`	`+ // Report pending app hang`
`64`	`65`	`featureScope.rumDataStore.value(forKey: .fatalAppHangKey) { [weak self] (fatalHang: FatalAppHang?) in`
`65`	`66`	`guard let fatalHang = fatalHang else {`
`66`	`67`	`DD.logger.debug("No pending App Hang found")`
`@@ -71,6 +72,9 @@ internal final class FatalAppHangsHandler {`
`71`	`72`	`}`
`72`	`73`	`self?.send(fatalHang: fatalHang)`
`73`	`74`	`}`
	`75`	`+`
	`76`	`+ // Remove pending app hang`
	`77`	`+ featureScope.rumDataStore.removeValue(forKey: .fatalAppHangKey)`
`74`	`78`	`}`
`75`	`79`
`76`	`80`	`private func send(fatalHang: FatalAppHang) {`
Original file line number	Diff line number	Diff line change
`@@ -196,6 +196,7 @@ class AppHangsMonitorTests: XCTestCase {`
`196`	`196`	`XCTAssertEqual(featureScope.eventsWritten.count, 2, "It must send both RUM error and RUM view")`
`197`	`197`	`XCTAssertEqual(featureScope.eventsWritten(ofType: RUMErrorEvent.self).count, 1)`
`198`	`198`	`XCTAssertEqual(featureScope.eventsWritten(ofType: RUMViewEvent.self).count, 1)`
	`199`	`+ XCTAssertNil(featureScope.dataStoreMock.value(forKey: RUMDataStore.Key.fatalAppHangKey.rawValue))`
`199`	`200`	`}`
`200`	`201`
`201`	`202`	`func testGivenPendingHangStartedMoreThan4HoursAgo_whenStartedInAnotherProcess_itSendsOnlyRUMError() throws {`
`@@ -235,6 +236,7 @@ class AppHangsMonitorTests: XCTestCase {`
`235`	`236`
`236`	`237`	`XCTAssertEqual(featureScope.eventsWritten.count, 1, "It must send only RUM error")`
`237`	`238`	`XCTAssertEqual(featureScope.eventsWritten(ofType: RUMErrorEvent.self).count, 1)`
	`239`	`+ XCTAssertNil(featureScope.dataStoreMock.value(forKey: RUMDataStore.Key.fatalAppHangKey.rawValue))`
`238`	`240`	`}`
`239`	`241`
`240`	`242`	`func testGivenPendingHangStartedWithPendingOrNotGrantedConsent_whenStartedInAnotherProcess_itSendsNoEvent() throws {`
`@@ -272,6 +274,7 @@ class AppHangsMonitorTests: XCTestCase {`
`272`	`274`	`)`
`273`	`275`
`274`	`276`	`XCTAssertEqual(featureScope.eventsWritten.count, 0, "It must send no event")`
	`277`	`+ XCTAssertNil(featureScope.dataStoreMock.value(forKey: RUMDataStore.Key.fatalAppHangKey.rawValue))`
`275`	`278`	`}`
`276`	`279`
`277`	`280`	`// MARK: - Fatal App Hangs - Testing Uploaded Data`