From 6ba63bdca6bf983182327d87451411c1a97a9f79 Mon Sep 17 00:00:00 2001 From: Maxime Epain Date: Wed, 28 May 2025 17:50:43 +0200 Subject: [PATCH 1/3] Re-export DatadogInternal.RUMMethod from RUM --- DatadogObjc/Sources/RUM/RUM+objc.swift | 3 ++- DatadogRUM/Sources/RUMMonitorProtocol.swift | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/DatadogObjc/Sources/RUM/RUM+objc.swift b/DatadogObjc/Sources/RUM/RUM+objc.swift index 8bd265cee4..07cce0609e 100644 --- a/DatadogObjc/Sources/RUM/RUM+objc.swift +++ b/DatadogObjc/Sources/RUM/RUM+objc.swift @@ -6,9 +6,10 @@ import Foundation import UIKit -import DatadogInternal import DatadogRUM +import struct DatadogInternal.AnyEncodable + internal struct UIKitRUMViewsPredicateBridge: UIKitRUMViewsPredicate { let objcPredicate: DDUIKitRUMViewsPredicate diff --git a/DatadogRUM/Sources/RUMMonitorProtocol.swift b/DatadogRUM/Sources/RUMMonitorProtocol.swift index 03f6c642ef..a546109a3c 100644 --- a/DatadogRUM/Sources/RUMMonitorProtocol.swift +++ b/DatadogRUM/Sources/RUMMonitorProtocol.swift @@ -8,6 +8,10 @@ import UIKit import Foundation import DatadogInternal +// swiftlint:disable duplicate_imports +@_exported import enum DatadogInternal.RUMMethod +// swiftlint:enable duplicate_imports + /// The type of RUM resource. public typealias RUMResourceType = RUMResourceEvent.Resource.ResourceType From bff978d48a66fd2e4873268a635e125601ba34ed Mon Sep 17 00:00:00 2001 From: Maxime Epain Date: Wed, 28 May 2025 17:51:20 +0200 Subject: [PATCH 2/3] Bumped version to 2.28.1 --- DatadogAlamofireExtension.podspec | 2 +- DatadogCore.podspec | 2 +- DatadogCore/Sources/Versioning.swift | 2 +- DatadogCrashReporting.podspec | 2 +- DatadogInternal.podspec | 2 +- DatadogLogs.podspec | 2 +- DatadogObjc.podspec | 2 +- DatadogRUM.podspec | 2 +- DatadogSessionReplay.podspec | 2 +- DatadogTrace.podspec | 2 +- DatadogWebViewTracking.podspec | 2 +- TestUtilities.podspec | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/DatadogAlamofireExtension.podspec b/DatadogAlamofireExtension.podspec index fee87eddc0..65ea8b6ab9 100644 --- a/DatadogAlamofireExtension.podspec +++ b/DatadogAlamofireExtension.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "DatadogAlamofireExtension" - s.version = "2.28.0" + s.version = "2.28.1" 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 index 97c2519a5e..ecf25593f6 100644 --- a/DatadogCore.podspec +++ b/DatadogCore.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "DatadogCore" - s.version = "2.28.0" + s.version = "2.28.1" 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 index c85543a485..260e0962da 100644 --- a/DatadogCore/Sources/Versioning.swift +++ b/DatadogCore/Sources/Versioning.swift @@ -1,3 +1,3 @@ // GENERATED FILE: Do not edit directly -internal let __sdkVersion = "2.28.0" +internal let __sdkVersion = "2.28.1" diff --git a/DatadogCrashReporting.podspec b/DatadogCrashReporting.podspec index 78c66645b2..0599120866 100644 --- a/DatadogCrashReporting.podspec +++ b/DatadogCrashReporting.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "DatadogCrashReporting" - s.version = "2.28.0" + s.version = "2.28.1" s.summary = "Official Datadog Crash Reporting SDK for iOS." s.homepage = "https://www.datadoghq.com" diff --git a/DatadogInternal.podspec b/DatadogInternal.podspec index 8ce901cd54..4148df0a98 100644 --- a/DatadogInternal.podspec +++ b/DatadogInternal.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "DatadogInternal" - s.version = "2.28.0" + s.version = "2.28.1" 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 index 14be343e54..e051960e74 100644 --- a/DatadogLogs.podspec +++ b/DatadogLogs.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "DatadogLogs" - s.version = "2.28.0" + s.version = "2.28.1" s.summary = "Datadog Logs Module." s.homepage = "https://www.datadoghq.com" diff --git a/DatadogObjc.podspec b/DatadogObjc.podspec index d27f3baae1..eeb4352efb 100644 --- a/DatadogObjc.podspec +++ b/DatadogObjc.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "DatadogObjc" - s.version = "2.28.0" + s.version = "2.28.1" s.summary = "Official Datadog Objective-C SDK for iOS." s.homepage = "https://www.datadoghq.com" diff --git a/DatadogRUM.podspec b/DatadogRUM.podspec index 4291ac48e0..1fbc4e31dc 100644 --- a/DatadogRUM.podspec +++ b/DatadogRUM.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "DatadogRUM" - s.version = "2.28.0" + s.version = "2.28.1" s.summary = "Datadog Real User Monitoring Module." s.homepage = "https://www.datadoghq.com" diff --git a/DatadogSessionReplay.podspec b/DatadogSessionReplay.podspec index e66878ea51..5b3c54267b 100644 --- a/DatadogSessionReplay.podspec +++ b/DatadogSessionReplay.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "DatadogSessionReplay" - s.version = "2.28.0" + s.version = "2.28.1" s.summary = "Official Datadog Session Replay SDK for iOS." s.homepage = "https://www.datadoghq.com" diff --git a/DatadogTrace.podspec b/DatadogTrace.podspec index 2765a78b46..a9c6db3b26 100644 --- a/DatadogTrace.podspec +++ b/DatadogTrace.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "DatadogTrace" - s.version = "2.28.0" + s.version = "2.28.1" s.summary = "Datadog Trace Module." s.homepage = "https://www.datadoghq.com" diff --git a/DatadogWebViewTracking.podspec b/DatadogWebViewTracking.podspec index b90a03de04..4eacfe2ccc 100644 --- a/DatadogWebViewTracking.podspec +++ b/DatadogWebViewTracking.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "DatadogWebViewTracking" - s.version = "2.28.0" + s.version = "2.28.1" s.summary = "Datadog WebView Tracking Module." s.homepage = "https://www.datadoghq.com" diff --git a/TestUtilities.podspec b/TestUtilities.podspec index 0e95d0a3cf..8dc3999eaa 100644 --- a/TestUtilities.podspec +++ b/TestUtilities.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "TestUtilities" - s.version = "2.28.0" + s.version = "2.28.1" s.summary = "Datadog Testing Utilities. This module is for internal testing and should not be published." s.homepage = "https://www.datadoghq.com" From a9619dc2f9ee6a82befefe0e9a157a529ca9987f Mon Sep 17 00:00:00 2001 From: Maxime Epain Date: Wed, 28 May 2025 17:55:04 +0200 Subject: [PATCH 3/3] Update CHANGELOG.md --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5ccd5e953e..0ee01e87ce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Unreleased +# 2.28.1 / 29-05-2025 + +- [FIX] Fix `RUMMethod` export from RUM. See [#2316][] + # 2.28.0 / 26-05-2025 - [IMPROVEMENT] Increase RUM batch maximum age to 24hrs. See [#2302][] @@ -879,6 +883,7 @@ Release `2.0` introduces breaking changes. Follow the [Migration Guide](MIGRATIO [#2268]: https://github.com/DataDog/dd-sdk-ios/pull/2268 [#2302]: https://github.com/DataDog/dd-sdk-ios/pull/2302 [#2304]: https://github.com/DataDog/dd-sdk-ios/pull/2304 +[#2316]: https://github.com/DataDog/dd-sdk-ios/pull/2316 [@00fa9a]: https://github.com/00FA9A [@britton-earnin]: https://github.com/Britton-Earnin [@hengyu]: https://github.com/Hengyu