Merge pull request #2754 from DataDog/hotfix/3.8.1

Merge `hotfix/3.8.1` to develop

Author: simaoseica-dd

.gitlab-ci.yml

@@ -234,6 +234,8 @@ Smoke Tests (iOS):
   rules: 
     - !reference [.test-pipeline-job, rules]
     - !reference [.release-pipeline-job, rules]
+  id_tokens:
+    <<: *dd-octo-sts-id-token
   variables:
     PLATFORM: "iOS Simulator"
     DEVICE: "iPhone 16 Pro"
@@ -247,6 +249,8 @@ Smoke Tests (tvOS):
   rules: 
     - !reference [.test-pipeline-job, rules]
     - !reference [.release-pipeline-job, rules]
+  id_tokens:
+    <<: *dd-octo-sts-id-token
   variables:
     PLATFORM: "tvOS Simulator"
     DEVICE: "Apple TV"
@@ -359,6 +363,8 @@ Build Artifacts:
   stage: release-build
   rules: 
     - !reference [.release-pipeline-job, rules]
+  id_tokens:
+    <<: *dd-octo-sts-id-token
   artifacts:
     paths:
       - artifacts

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Unreleased
 
+# 3.8.1 / 13-03-2026
+
+- [FIX] Fix crash when network instrumentation intercepts `AVAssetDownloadTask` or `AVAggregateAssetDownloadTask`. See [#2750][]
+
 # 3.8.0 / 12-03-2026
 
 - [FEATURE] Add OOB scroll and swipe action tracking. See [#2717][]
@@ -1075,6 +1079,7 @@ Release `2.0` introduces breaking changes. Follow the [Migration Guide](MIGRATIO
 [#2721]: https://github.com/DataDog/dd-sdk-ios/pull/2721
 [#2726]: https://github.com/DataDog/dd-sdk-ios/pull/2726
 [#2740]: https://github.com/DataDog/dd-sdk-ios/pull/2740
+[#2750]: https://github.com/DataDog/dd-sdk-ios/pull/2750
 
 [@00fa9a]: https://github.com/00FA9A
 [@britton-earnin]: https://github.com/Britton-Earnin

DatadogCore.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "DatadogCore"
-  s.version      = "3.8.0"
+  s.version      = "3.8.1"
   s.summary      = "Official Datadog Swift SDK for iOS."
 
   s.homepage     = "https://www.datadoghq.com"

DatadogCore/Sources/Versioning.swift

@@ -1,3 +1,3 @@
 // GENERATED FILE: Do not edit directly
 
-internal let __sdkVersion = "3.8.0"
+internal let __sdkVersion = "3.8.1"

DatadogCrashReporting.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "DatadogCrashReporting"
-  s.version      = "3.8.0"
+  s.version      = "3.8.1"
   s.summary      = "Official Datadog Crash Reporting SDK for iOS."
 
   s.homepage     = "https://www.datadoghq.com"

DatadogFlags.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "DatadogFlags"
-  s.version      = "3.8.0"
+  s.version      = "3.8.1"
   s.summary      = "Official Datadog Feature Flags module of the Swift SDK."
 
   s.homepage     = "https://www.datadoghq.com"

DatadogInternal.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "DatadogInternal"
-  s.version      = "3.8.0"
+  s.version      = "3.8.1"
   s.summary      = "Datadog Internal Package. This module is not for public use."
 
   s.homepage     = "https://www.datadoghq.com"

DatadogInternal/Sources/NetworkInstrumentation/NetworkInstrumentationFeature.swift

@@ -91,8 +91,19 @@ internal final class NetworkInstrumentationFeature: DatadogFeature {
                     return
                 }
 
+                // Skip task types that declare standard URLSessionTask properties as
+                // NS_UNAVAILABLE and throw NSGenericException at runtime when accessed
+                // (e.g. AVAssetDownloadTask, AVAggregateAssetDownloadTask).
+                guard task.isSupportedForInstrumentation else {
+                    return
+                }
+
+                guard let currentRequest = task.currentRequest else {
+                    return
+                }
+
                 // Skip Datadog's own intake requests to prevent infinite recursion
-                if self.isDatadogIntakeRequest(task.currentRequest) {
+                if self.isDatadogIntakeRequest(currentRequest) {
                     return
                 }
 
@@ -106,11 +117,9 @@ internal final class NetworkInstrumentationFeature: DatadogFeature {
                 var injectedTraceContexts = [RequestInstrumentationContext]()
 
                 let configuredFirstPartyHosts = FirstPartyHosts(firstPartyHosts: configuration?.firstPartyHostsTracing) ?? .init()
-                if let currentRequest = task.currentRequest {
-                    let (request, traceContexts) = self.intercept(request: currentRequest, additionalFirstPartyHosts: configuredFirstPartyHosts)
-                    task.dd.override(currentRequest: request)
-                    injectedTraceContexts = traceContexts
-                }
+                let (request, traceContexts) = self.intercept(request: currentRequest, additionalFirstPartyHosts: configuredFirstPartyHosts)
+                task.dd.override(currentRequest: request)
+                injectedTraceContexts = traceContexts
 
                 self.intercept(task: task, with: injectedTraceContexts, additionalFirstPartyHosts: configuredFirstPartyHosts, trackingMode: trackingMode)
             }

DatadogInternal/Sources/NetworkInstrumentation/URLSession/URLSessionTask+Tracking.swift

@@ -50,3 +50,25 @@ extension DatadogExtension where ExtendedType: URLSessionTask {
 }
 
 private var hasCompletionKey: Void?
+
+extension URLSessionTask {
+    /// `URLSessionTask` subclasses that declare most of their inherited properties as `NS_UNAVAILABLE`
+    /// and throw `NSGenericException` at runtime when those properties are accessed.
+    /// Resolved once using `NSClassFromString` to avoid importing AVFoundation.
+    private static let unsupportedTaskClasses: [AnyClass] = {
+        [
+            "AVAssetDownloadTask",
+            "NSURLSessionAVAssetDownloadTask",
+            "AVAggregateAssetDownloadTask",
+            "NSURLSessionAVAggregateAssetDownloadTask"
+        ]
+            .compactMap { NSClassFromString($0) }
+    }()
+
+    /// Returns `true` if the task supports standard `URLSessionTask` property access and
+    /// can be instrumented. Some subclasses declare properties like `currentRequest` and
+    /// `response` as `NS_UNAVAILABLE` and throw `NSGenericException` at runtime when accessed.
+    var isSupportedForInstrumentation: Bool {
+        !Self.unsupportedTaskClasses.contains { self.isKind(of: $0) }
+    }
+}

DatadogInternal/Tests/NetworkInstrumentation/NetworkInstrumentationFeatureTests.swift

@@ -1887,6 +1887,92 @@ class NetworkInstrumentationFeatureTests: XCTestCase {
         XCTAssertEqual(interception.trace, traceContexts.first, "It should register first injected Trace Context")
     }
 
+    // MARK: - isSupportedForInstrumentation
+
+    func testIsSupportedForInstrumentation_returnsTrueForDataTask() {
+        let session = URLSession(configuration: .ephemeral)
+        let task = session.dataTask(with: URL.mockAny())
+        defer { task.cancel() }
+        XCTAssertTrue(task.isSupportedForInstrumentation)
+    }
+
+    func testIsSupportedForInstrumentation_returnsTrueForUploadTask() {
+        let session = URLSession(configuration: .ephemeral)
+        let task = session.uploadTask(with: URLRequest(url: URL.mockAny()), from: Data())
+        defer { task.cancel() }
+        XCTAssertTrue(task.isSupportedForInstrumentation)
+    }
+
+    func testIsSupportedForInstrumentation_returnsTrueForDownloadTask() {
+        let session = URLSession(configuration: .ephemeral)
+        let task = session.downloadTask(with: URL.mockAny())
+        defer { task.cancel() }
+        XCTAssertTrue(task.isSupportedForInstrumentation)
+    }
+
+    @available(iOS 13.0, tvOS 13.0, *)
+    func testIsSupportedForInstrumentation_returnsTrueForWebSocketTask() {
+        let session = URLSession(configuration: .ephemeral)
+        let task = session.webSocketTask(with: URL(string: "wss://example.com")!)
+        defer { task.cancel() }
+        XCTAssertTrue(task.isSupportedForInstrumentation)
+    }
+
+    func testIsSupportedForInstrumentation_returnsTrueForStreamTask() {
+        let session = URLSession(configuration: .ephemeral)
+        let task = session.streamTask(withHostName: "example.com", port: 80)
+        defer { task.cancel() }
+        XCTAssertTrue(task.isSupportedForInstrumentation)
+    }
+
+    func testIsSupportedForInstrumentation_returnsFalseForUnsupportedAVTaskTypes() {
+        let unsupportedClassNames = [
+            "AVAssetDownloadTask",
+            "NSURLSessionAVAssetDownloadTask",
+            "AVAggregateAssetDownloadTask",
+            "NSURLSessionAVAggregateAssetDownloadTask",
+            "__NSCFBackgroundAVAssetDownloadTask"
+        ]
+        for className in unsupportedClassNames {
+            guard let task = NSClassFromString(className)?.alloc() as? URLSessionTask else {
+                continue // class unavailable on this platform/OS version
+            }
+            XCTAssertFalse(task.isSupportedForInstrumentation, "\(className) should not be instrumented")
+        }
+    }
+
+    // MARK: - Crash regression: resume() on various task types
+
+    @available(iOS 13.0, tvOS 13.0, *)
+    func testWebSocketTask_resumeDoesNotCrash() throws {
+        // Regression: verify that resuming a WebSocketTask with the swizzle installed doesn't crash.
+        // The crash in interceptResume is synchronous, so no real connection is needed — we cancel immediately.
+        try URLSessionInstrumentation.enableOrThrow(with: nil, in: core)
+        let session = URLSession(configuration: .ephemeral)
+        let task = session.webSocketTask(with: URL(string: "wss://example.com")!)
+        task.resume()
+        task.cancel()
+
+        let feature = try XCTUnwrap(core.get(feature: NetworkInstrumentationFeature.self))
+        feature.flush()
+        // No crash = pass. WebSocketTask is a supported type and should be tracked.
+        XCTAssertEqual(handler.interceptions.count, 1)
+    }
+
+    func testStreamTask_resumeDoesNotCrash() throws {
+        // Regression: verify that resuming a StreamTask with the swizzle installed doesn't crash.
+        try URLSessionInstrumentation.enableOrThrow(with: nil, in: core)
+        let session = URLSession(configuration: .ephemeral)
+        let task = session.streamTask(withHostName: "example.com", port: 80)
+        task.resume()
+        task.cancel()
+
+        let feature = try XCTUnwrap(core.get(feature: NetworkInstrumentationFeature.self))
+        feature.flush()
+        // No crash = pass. StreamTask is a supported type and should be tracked.
+        XCTAssertEqual(handler.interceptions.count, 1)
+    }
+
     // MARK: - First Party Hosts
 
     func testAutomaticMode_detectsFirstPartyHosts() throws {