Merge branch 'develop' into release/2.9.0

DataDog · Apr 11, 2024 · 290ed6c · 290ed6c
2 parents 6ae0fb9 + 93ed73a
commit 290ed6c
Show file tree

Hide file tree

Showing 91 changed files with 2,831 additions and 1,012 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Unreleased
 
+* [FEATURE] Fatal App Hangs are tracked in RUM. See [#1763][]
+
 # 2.9.0 / 11-04-2024
 
 * [FEATURE] Call RUM's `errorEventMapper` for crashes. See [#1742][]
@@ -627,6 +629,7 @@ Release `2.0` introduces breaking changes. Follow the [Migration Guide](MIGRATIO
 [#1741]: https://github.com/DataDog/dd-sdk-ios/pull/1741
 [#1742]: https://github.com/DataDog/dd-sdk-ios/pull/1742
 [#1746]: https://github.com/DataDog/dd-sdk-ios/pull/1746
+[#1763]: https://github.com/DataDog/dd-sdk-ios/pull/1763
 [#1767]: https://github.com/DataDog/dd-sdk-ios/pull/1767
 [@00fa9a]: https://github.com/00FA9A
 [@britton-earnin]: https://github.com/Britton-Earnin

diff --git a/Datadog/Datadog.xcodeproj/project.pbxproj b/Datadog/Datadog.xcodeproj/project.pbxproj
diff --git a/Datadog/IntegrationUnitTests/CrashReporting/SendingCrashReportTests.swift b/Datadog/IntegrationUnitTests/CrashReporting/SendingCrashReportTests.swift
@@ -72,14 +72,14 @@ class SendingCrashReportTests: XCTestCase {
         XCTAssertNotNil(log.attributes.internalAttributes?[DDError.wasTruncated])
 
         // Then (RUMError is sent)
-        let rumEvent = try XCTUnwrap(core.waitAndReturnEvents(ofFeature: RUMFeature.name, ofType: RUMCrashEvent.self).first)
-        XCTAssertEqual(rumEvent.model.error.message, crashReport.message)
-        XCTAssertEqual(rumEvent.model.error.type, crashReport.type)
-        XCTAssertEqual(rumEvent.model.error.stack, crashReport.stack)
-        XCTAssertNotNil(rumEvent.additionalAttributes?[DDError.threads])
-        XCTAssertNotNil(rumEvent.additionalAttributes?[DDError.binaryImages])
-        XCTAssertNotNil(rumEvent.additionalAttributes?[DDError.meta])
-        XCTAssertNotNil(rumEvent.additionalAttributes?[DDError.wasTruncated])
+        let rumEvent = try XCTUnwrap(core.waitAndReturnEvents(ofFeature: RUMFeature.name, ofType: RUMErrorEvent.self).first)
+        XCTAssertEqual(rumEvent.error.message, crashReport.message)
+        XCTAssertEqual(rumEvent.error.type, crashReport.type)
+        XCTAssertEqual(rumEvent.error.stack, crashReport.stack)
+        XCTAssertNotNil(rumEvent.error.threads)
+        XCTAssertNotNil(rumEvent.error.binaryImages)
+        XCTAssertNotNil(rumEvent.error.meta)
+        XCTAssertNotNil(rumEvent.error.wasTruncated)
     }
 
     func testWhenSendingCrashReportAsLog_itIsLinkedToTheRUMSessionThatHasCrashed() throws {

diff --git a/Datadog/IntegrationUnitTests/Public/NetworkInstrumentationIntegrationTests.swift b/Datadog/IntegrationUnitTests/Public/NetworkInstrumentationIntegrationTests.swift
@@ -34,7 +34,8 @@ class NetworkInstrumentationIntegrationTests: XCTestCase {
                 )
             )
         )
-        config.traceIDGenerator = RelativeTracingUUIDGenerator(startingFrom: 1, advancingByCount: 1)
+        config.traceIDGenerator = RelativeTracingUUIDGenerator(startingFrom: .init(idHi: 10, idLo: 100))
+        config.spanIDGenerator = RelativeSpanIDGenerator(startingFrom: 100, advancingByCount: 1)
 
         Trace.enable(
             with: config,
@@ -76,15 +77,15 @@ class NetworkInstrumentationIntegrationTests: XCTestCase {
 
         let matcher1 = try XCTUnwrap(matchers.first)
         try XCTAssertEqual(matcher1.operationName(), "root")
-        try XCTAssertEqual(matcher1.traceID(), "1")
-        try XCTAssertEqual(matcher1.spanID(), "2")
+        try XCTAssertEqual(matcher1.traceID(), .init(idHi: 10, idLo: 100))
+        try XCTAssertEqual(matcher1.spanID(), .init(rawValue: 100))
         try XCTAssertEqual(matcher1.metrics.isRootSpan(), 1)
 
         let matcher2 = try XCTUnwrap(matchers.last)
         try XCTAssertEqual(matcher2.operationName(), "urlsession.request")
-        try XCTAssertEqual(matcher2.traceID(), "1")
-        try XCTAssertEqual(matcher2.parentSpanID(), "2")
-        try XCTAssertEqual(matcher2.spanID(), "3")
+        try XCTAssertEqual(matcher2.traceID(), .init(idHi: 10, idLo: 100))
+        try XCTAssertEqual(matcher2.parentSpanID(), .init(rawValue: 100))
+        try XCTAssertEqual(matcher2.spanID(), .init(rawValue: 101))
     }
 
     class MockDelegate: NSObject, URLSessionDataDelegate {

diff --git a/Datadog/IntegrationUnitTests/RUM/AppHangsMonitoringTests.swift b/Datadog/IntegrationUnitTests/RUM/AppHangsMonitoringTests.swift
@@ -51,8 +51,8 @@ class AppHangsMonitoringTests: XCTestCase {
         let appHangError = try XCTUnwrap(errors.first)
         let actualHangDuration = try XCTUnwrap(appHangError.freeze?.duration)
 
-        XCTAssertEqual(appHangError.error.message, AppHangsObserver.Constants.appHangErrorMessage)
-        XCTAssertEqual(appHangError.error.type, AppHangsObserver.Constants.appHangErrorType)
+        XCTAssertEqual(appHangError.error.message, AppHangsMonitor.Constants.appHangErrorMessage)
+        XCTAssertEqual(appHangError.error.type, AppHangsMonitor.Constants.appHangErrorType)
         XCTAssertEqual(appHangError.error.category, .appHang)
         XCTAssertTrue(expectedHangDurationRangeNs.contains(actualHangDuration))
     }
@@ -74,8 +74,8 @@ class AppHangsMonitoringTests: XCTestCase {
         let appHangError = try XCTUnwrap(errors.first)
         let actualHangDuration = try XCTUnwrap(appHangError.freeze?.duration)
 
-        XCTAssertEqual(appHangError.error.message, AppHangsObserver.Constants.appHangErrorMessage)
-        XCTAssertEqual(appHangError.error.type, AppHangsObserver.Constants.appHangErrorType)
+        XCTAssertEqual(appHangError.error.message, AppHangsMonitor.Constants.appHangErrorMessage)
+        XCTAssertEqual(appHangError.error.type, AppHangsMonitor.Constants.appHangErrorType)
         XCTAssertEqual(appHangError.error.category, .appHang)
         XCTAssertTrue(expectedHangDurationRangeNs.contains(actualHangDuration))
     }
@@ -104,8 +104,8 @@ class AppHangsMonitoringTests: XCTestCase {
         let appHangError = try XCTUnwrap(errors.first)
         let mainThreadStack = try XCTUnwrap(appHangError.error.stack)
 
-        XCTAssertEqual(appHangError.error.message, AppHangsObserver.Constants.appHangErrorMessage)
-        XCTAssertEqual(appHangError.error.type, AppHangsObserver.Constants.appHangErrorType)
+        XCTAssertEqual(appHangError.error.message, AppHangsMonitor.Constants.appHangErrorMessage)
+        XCTAssertEqual(appHangError.error.type, AppHangsMonitor.Constants.appHangErrorType)
         XCTAssertTrue(mainThreadStack.contains(uiKitLibraryName), "Main thread stack should include UIKit symbols")
         XCTAssertEqual(appHangError.error.source, .source)
         XCTAssertNotNil(appHangError.error.threads, "Other threads should be available")
@@ -128,9 +128,9 @@ class AppHangsMonitoringTests: XCTestCase {
         let errors = core.waitAndReturnEvents(ofFeature: RUMFeature.name, ofType: RUMErrorEvent.self)
         let appHangError = try XCTUnwrap(errors.first)
 
-        XCTAssertEqual(appHangError.error.message, AppHangsObserver.Constants.appHangErrorMessage)
-        XCTAssertEqual(appHangError.error.type, AppHangsObserver.Constants.appHangErrorType)
-        XCTAssertEqual(appHangError.error.stack, AppHangsObserver.Constants.appHangStackNotAvailableErrorMessage)
+        XCTAssertEqual(appHangError.error.message, AppHangsMonitor.Constants.appHangErrorMessage)
+        XCTAssertEqual(appHangError.error.type, AppHangsMonitor.Constants.appHangErrorType)
+        XCTAssertEqual(appHangError.error.stack, AppHangsMonitor.Constants.appHangStackNotAvailableErrorMessage)
         XCTAssertEqual(appHangError.error.source, .source)
         XCTAssertNil(appHangError.error.threads, "Threads should be unavailable as CrashReporting was not enabled")
         XCTAssertNil(appHangError.error.binaryImages,  "Binary Images should be unavailable as CrashReporting was not enabled")

diff --git a/DatadogCore/Tests/Datadog/FeaturesIntegration/TracingWithLoggingIntegrationTests.swift b/DatadogCore/Tests/Datadog/FeaturesIntegration/TracingWithLoggingIntegrationTests.swift
@@ -33,7 +33,7 @@ class TracingWithLoggingIntegrationTests: XCTestCase {
 
         // When
         integration.writeLog(
-            withSpanContext: .mockWith(traceID: 1, spanID: 2),
+            withSpanContext: .mockWith(traceID: .init(idHi: 10, idLo: 100), spanID: 200),
             fields: [
                 OTLogFields.message: "hello",
                 "custom field": 123,
@@ -56,8 +56,8 @@ class TracingWithLoggingIntegrationTests: XCTestCase {
         DDAssertJSONEqual(
             AnyEncodable(log.attributes.internalAttributes),
             AnyEncodable([
-                "dd.trace_id": "1",
-                "dd.span_id": "2"
+                "dd.trace_id": "a0000000000000064",
+                "dd.span_id": "c8"
             ])
         )
     }
@@ -110,7 +110,7 @@ class TracingWithLoggingIntegrationTests: XCTestCase {
 
         // When
         integration.writeLog(
-            withSpanContext: .mockWith(traceID: 1, spanID: 2),
+            withSpanContext: .mockWith(traceID: .init(idHi: 10, idLo: 100), spanID: 200),
             fields: ["custom field": 123],
             date: .mockDecember15th2019At10AMUTC(),
             else: {}
@@ -130,8 +130,8 @@ class TracingWithLoggingIntegrationTests: XCTestCase {
         DDAssertJSONEqual(
             AnyEncodable(log.attributes.internalAttributes),
             AnyEncodable([
-                "dd.trace_id": "1",
-                "dd.span_id": "2"
+                "dd.trace_id": "a0000000000000064",
+                "dd.span_id": "c8"
             ])
         )
     }

diff --git a/DatadogCore/Tests/Datadog/LoggerTests.swift b/DatadogCore/Tests/Datadog/LoggerTests.swift
@@ -865,11 +865,11 @@ class LoggerTests: XCTestCase {
         let logMatchers = try core.waitAndReturnLogMatchers()
         logMatchers[0].assertValue(
             forKeyPath: "dd.trace_id",
-            equals: String(span.context.dd.traceID)
+            equals: span.context.dd.traceID.toString(representation: .hexadecimal)
         )
         logMatchers[0].assertValue(
             forKeyPath: "dd.span_id",
-            equals: String(span.context.dd.spanID)
+            equals: span.context.dd.spanID.toString(representation: .decimal)
         )
         logMatchers[1].assertNoValue(forKey: "dd.trace_id")
         logMatchers[1].assertNoValue(forKey: "dd.span_id")

diff --git a/DatadogCore/Tests/Datadog/Mocks/RUMDataModelMocks.swift b/DatadogCore/Tests/Datadog/Mocks/RUMDataModelMocks.swift
@@ -130,7 +130,7 @@ extension RUMViewEvent: RandomMockable {
                 pageStates: nil,
                 replayStats: nil,
                 session: .init(
-                    plan: [.plan1, .plan2].randomElement()!,
+                    plan: .plan1,
                     sessionPrecondition: .mockRandom()
                 )
             ),
@@ -432,19 +432,6 @@ extension RUMErrorEvent: RandomMockable {
     }
 }
 
-extension RUMCrashEvent: RandomMockable {
-    static func mockRandom(error: RUMErrorEvent) -> RUMCrashEvent {
-        return .init(
-            error: error,
-            additionalAttributes: mockRandomAttributes()
-        )
-    }
-
-    public static func mockRandom() -> RUMCrashEvent {
-        return mockRandom(error: .mockRandom())
-    }
-}
-
 extension RUMLongTaskEvent.DD.Configuration: RandomMockable {
     public static func mockRandom() -> RUMLongTaskEvent.DD.Configuration {
         return .init(sessionReplaySampleRate: .mockRandom(min: 0, max: 100), sessionSampleRate: .mockRandom(min: 0, max: 100))

diff --git a/DatadogCore/Tests/Datadog/Mocks/RUMFeatureMocks.swift b/DatadogCore/Tests/Datadog/Mocks/RUMFeatureMocks.swift
@@ -319,15 +319,15 @@ extension RUMSpanContext: AnyMockable, RandomMockable {
 
     public static func mockRandom() -> RUMSpanContext {
         return RUMSpanContext(
-            traceID: .mockRandom(),
-            spanID: .mockRandom(),
+            traceID: .mock(.mockRandom(), .mockRandom()),
+            spanID: .mock(.mockRandom()),
             samplingRate: .mockRandom()
         )
     }
 
     static func mockWith(
-        traceID: String = .mockAny(),
-        spanID: String = .mockAny(),
+        traceID: TraceID = .mockAny(),
+        spanID: SpanID = .mockAny(),
         samplingRate: Double = .mockAny()
     ) -> RUMSpanContext {
         return RUMSpanContext(
@@ -350,7 +350,11 @@ extension RUMStartResourceCommand: AnyMockable, RandomMockable {
             httpMethod: .mockRandom(),
             kind: .mockAny(),
             isFirstPartyRequest: .mockRandom(),
-            spanContext: .init(traceID: .mockRandom(), spanID: .mockRandom(), samplingRate: .mockAny())
+            spanContext: .init(
+                traceID: .mock(.mockRandom(), .mockRandom()),
+                spanID: .mock(.mockRandom()),
+                samplingRate: .mockAny()
+            )
         )
     }
 

diff --git a/DatadogCore/Tests/Datadog/Mocks/TracingFeatureMocks.swift b/DatadogCore/Tests/Datadog/Mocks/TracingFeatureMocks.swift
@@ -84,8 +84,8 @@ extension DDSpanContext {
 
     static func mockWith(
         traceID: TraceID = .mockAny(),
-        spanID: TraceID = .mockAny(),
-        parentSpanID: TraceID? = .mockAny(),
+        spanID: SpanID = .mockAny(),
+        parentSpanID: SpanID? = .mockAny(),
         baggageItems: BaggageItems = .mockAny()
     ) -> DDSpanContext {
         return DDSpanContext(
@@ -114,7 +114,8 @@ extension DatadogTracer {
         core: DatadogCoreProtocol,
         sampler: Sampler = .mockKeepAll(),
         tags: [String: Encodable] = [:],
-        tracingUUIDGenerator: TraceIDGenerator = DefaultTraceIDGenerator(),
+        traceIDGenerator: TraceIDGenerator = DefaultTraceIDGenerator(),
+        spanIDGenerator: SpanIDGenerator = DefaultSpanIDGenerator(),
         dateProvider: DateProvider = SystemDateProvider(),
         spanEventBuilder: SpanEventBuilder = .mockAny(),
         loggingIntegration: TracingWithLoggingIntegration = .mockAny()
@@ -123,7 +124,8 @@ extension DatadogTracer {
             core: core,
             sampler: sampler,
             tags: tags,
-            tracingUUIDGenerator: tracingUUIDGenerator,
+            traceIDGenerator: traceIDGenerator,
+            spanIDGenerator: spanIDGenerator,
             dateProvider: dateProvider,
             loggingIntegration: loggingIntegration,
             spanEventBuilder: spanEventBuilder