From 2f93b15d6a6e5ddbf34bde3fe00d32ad9aea983f Mon Sep 17 00:00:00 2001 From: Marco Saia Date: Wed, 23 Jul 2025 13:32:57 +0200 Subject: [PATCH] RUMS-4657: fix parsing of custom RUM timestamps --- .../ios/Sources/DdRumImplementation.swift | 2 +- packages/core/ios/Tests/DdRumTests.swift | 20 +++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/packages/core/ios/Sources/DdRumImplementation.swift b/packages/core/ios/Sources/DdRumImplementation.swift index a86a24b49..9f8da4c7f 100644 --- a/packages/core/ios/Sources/DdRumImplementation.swift +++ b/packages/core/ios/Sources/DdRumImplementation.swift @@ -213,7 +213,7 @@ public class DdRumImplementation: NSObject { private func attributes(from context: NSDictionary, with timestampMs: Double) -> [String: Encodable] { var context = context as? [String: Any] ?? [:] - context[Self.timestampKey] = timestampMs + context[Self.timestampKey] = Int64(timestampMs) return castAttributesToSwift(context) } diff --git a/packages/core/ios/Tests/DdRumTests.swift b/packages/core/ios/Tests/DdRumTests.swift index c90ca8605..1102b7b6b 100644 --- a/packages/core/ios/Tests/DdRumTests.swift +++ b/packages/core/ios/Tests/DdRumTests.swift @@ -56,7 +56,7 @@ internal class DdRumTests: XCTestCase { let lastAttributes = try XCTUnwrap(mockNativeRUM.receivedAttributes.last) XCTAssertEqual(lastAttributes.count, 2) XCTAssertEqual(lastAttributes["foo"] as? Int64, 123) - XCTAssertEqual(lastAttributes[DdRumImplementation.timestampKey] as? Double, randomTimestamp) + XCTAssertEqual(lastAttributes[DdRumImplementation.timestampKey] as? Int64, Int64(randomTimestamp)) } func testStopView() throws { @@ -68,7 +68,7 @@ internal class DdRumTests: XCTestCase { let lastAttributes = try XCTUnwrap(mockNativeRUM.receivedAttributes.last) XCTAssertEqual(lastAttributes.count, 2) XCTAssertEqual(lastAttributes["foo"] as? Int64, 123) - XCTAssertEqual(lastAttributes[DdRumImplementation.timestampKey] as? Double, randomTimestamp) + XCTAssertEqual(lastAttributes[DdRumImplementation.timestampKey] as? Int64, Int64(randomTimestamp)) } func testStartAction() throws { @@ -80,7 +80,7 @@ internal class DdRumTests: XCTestCase { let lastAttributes = try XCTUnwrap(mockNativeRUM.receivedAttributes.last) XCTAssertEqual(lastAttributes.count, 2) XCTAssertEqual(lastAttributes["foo"] as? Int64, 123) - XCTAssertEqual(lastAttributes[DdRumImplementation.timestampKey] as? Double, randomTimestamp) + XCTAssertEqual(lastAttributes[DdRumImplementation.timestampKey] as? Int64, Int64(randomTimestamp)) } func testStopActionWithoutStarting() { @@ -99,7 +99,7 @@ internal class DdRumTests: XCTestCase { let lastAttributes = try XCTUnwrap(mockNativeRUM.receivedAttributes.last) XCTAssertEqual(lastAttributes.count, 2) XCTAssertEqual(lastAttributes["foo"] as? Int64, 123) - XCTAssertEqual(lastAttributes[DdRumImplementation.timestampKey] as? Double, randomTimestamp) + XCTAssertEqual(lastAttributes[DdRumImplementation.timestampKey] as? Int64, Int64(randomTimestamp)) } func testAddAction() throws { @@ -111,7 +111,7 @@ internal class DdRumTests: XCTestCase { let lastAttributes = try XCTUnwrap(mockNativeRUM.receivedAttributes.last) XCTAssertEqual(lastAttributes.count, 2) XCTAssertEqual(lastAttributes["foo"] as? Int64, 123) - XCTAssertEqual(lastAttributes[DdRumImplementation.timestampKey] as? Double, randomTimestamp) + XCTAssertEqual(lastAttributes[DdRumImplementation.timestampKey] as? Int64, Int64(randomTimestamp)) } func testStartResource() throws { @@ -123,7 +123,7 @@ internal class DdRumTests: XCTestCase { let lastAttributes = try XCTUnwrap(mockNativeRUM.receivedAttributes.last) XCTAssertEqual(lastAttributes.count, 2) XCTAssertEqual(lastAttributes["foo"] as? Int64, 123) - XCTAssertEqual(lastAttributes[DdRumImplementation.timestampKey] as? Double, randomTimestamp) + XCTAssertEqual(lastAttributes[DdRumImplementation.timestampKey] as? Int64, Int64(randomTimestamp)) } func testStopResource() throws { @@ -135,7 +135,7 @@ internal class DdRumTests: XCTestCase { let lastAttributes = try XCTUnwrap(mockNativeRUM.receivedAttributes.last) XCTAssertEqual(lastAttributes.count, 2) XCTAssertEqual(lastAttributes["foo"] as? Int64, 123) - XCTAssertEqual(lastAttributes[DdRumImplementation.timestampKey] as? Double, randomTimestamp) + XCTAssertEqual(lastAttributes[DdRumImplementation.timestampKey] as? Int64, Int64(randomTimestamp)) } func testStopResourceWithMissingSize() throws { @@ -147,7 +147,7 @@ internal class DdRumTests: XCTestCase { let lastAttributes = try XCTUnwrap(mockNativeRUM.receivedAttributes.last) XCTAssertEqual(lastAttributes.count, 2) XCTAssertEqual(lastAttributes["foo"] as? Int64, 123) - XCTAssertEqual(lastAttributes[DdRumImplementation.timestampKey] as? Double, randomTimestamp) + XCTAssertEqual(lastAttributes[DdRumImplementation.timestampKey] as? Int64, Int64(randomTimestamp)) } func testStopResourceWithExternalTimings() throws { @@ -230,7 +230,7 @@ internal class DdRumTests: XCTestCase { let lastAttributes = try XCTUnwrap(mockNativeRUM.receivedAttributes.last) XCTAssertEqual(lastAttributes.count, 2) XCTAssertEqual(lastAttributes["foo"] as? Int64, 123) - XCTAssertEqual(lastAttributes[DdRumImplementation.timestampKey] as? Double, randomTimestamp) + XCTAssertEqual(lastAttributes[DdRumImplementation.timestampKey] as? Int64, Int64(randomTimestamp)) } func testAddError() throws { @@ -242,7 +242,7 @@ internal class DdRumTests: XCTestCase { let lastAttributes = try XCTUnwrap(mockNativeRUM.receivedAttributes.last) XCTAssertEqual(lastAttributes.count, 2) XCTAssertEqual(lastAttributes["foo"] as? Int64, 123) - XCTAssertEqual(lastAttributes[DdRumImplementation.timestampKey] as? Double, randomTimestamp) + XCTAssertEqual(lastAttributes[DdRumImplementation.timestampKey] as? Int64, Int64(randomTimestamp)) } func testAddTiming() throws {