-
Notifications
You must be signed in to change notification settings - Fork 120
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1769 from DataDog/release/2.9.0
Release 2.9.0
- Loading branch information
Showing
104 changed files
with
2,966 additions
and
800 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
276 changes: 276 additions & 0 deletions
276
Datadog/IntegrationUnitTests/RUM/WebEventIntegrationTests.swift
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,276 @@ | ||
| /* | ||
| * Unless explicitly stated otherwise all files in this repository are licensed under the Apache License Version 2.0. | ||
| * This product includes software developed at Datadog (https://www.datadoghq.com/). | ||
| * Copyright 2019-Present Datadog, Inc. | ||
| */ | ||
|
|
||
| import XCTest | ||
| #if !os(tvOS) | ||
| import WebKit | ||
|
|
||
| import TestUtilities | ||
| @testable import DatadogRUM | ||
| @testable import DatadogWebViewTracking | ||
|
|
||
| class WebEventIntegrationTests: XCTestCase { | ||
| // swiftlint:disable implicitly_unwrapped_optional | ||
| private var core: DatadogCoreProxy! // swiftlint:disable:this implicitly_unwrapped_optional | ||
| private var controller: WKUserContentControllerMock! | ||
| // swiftlint:enable implicitly_unwrapped_optional | ||
|
|
||
| override func setUp() { | ||
| core = DatadogCoreProxy( | ||
| context: .mockWith( | ||
| env: "test", | ||
| version: "1.1.1", | ||
| serverTimeOffset: 123 | ||
| ) | ||
| ) | ||
|
|
||
| controller = WKUserContentControllerMock() | ||
| let configuration = WKWebViewConfiguration() | ||
| configuration.userContentController = controller | ||
| let webView = WKWebView(frame: .zero, configuration: configuration) | ||
| WebViewTracking.enable(webView: webView, in: core) | ||
| } | ||
|
|
||
| override func tearDown() { | ||
| core.flushAndTearDown() | ||
| core = nil | ||
| controller = nil | ||
| } | ||
|
|
||
| func testWebEventIntegration() throws { | ||
| // Given | ||
| let randomApplicationID: String = .mockRandom() | ||
| let randomUUID: UUID = .mockRandom() | ||
|
|
||
| RUM.enable(with: .mockWith(applicationID: randomApplicationID) { | ||
| $0.uuidGenerator = RUMUUIDGeneratorMock(uuid: randomUUID) | ||
| }, in: core) | ||
|
|
||
| let body = """ | ||
| { | ||
| "eventType": "view", | ||
| "event": { | ||
| "application": { | ||
| "id": "xxx" | ||
| }, | ||
| "date": \(1635932927012), | ||
| "service": "super", | ||
| "session": { | ||
| "id": "0110cab4-7471-480e-aa4e-7ce039ced355", | ||
| "type": "user" | ||
| }, | ||
| "type": "view", | ||
| "view": { | ||
| "action": { | ||
| "count": 0 | ||
| }, | ||
| "cumulative_layout_shift": 0, | ||
| "dom_complete": 152800000, | ||
| "dom_content_loaded": 118300000, | ||
| "dom_interactive": 116400000, | ||
| "error": { | ||
| "count": 0 | ||
| }, | ||
| "first_contentful_paint": 121300000, | ||
| "id": "64308fd4-83f9-48cb-b3e1-1e91f6721230", | ||
| "in_foreground_periods": [], | ||
| "is_active": true, | ||
| "largest_contentful_paint": 121299000, | ||
| "load_event": 152800000, | ||
| "loading_time": 152800000, | ||
| "loading_type": "initial_load", | ||
| "long_task": { | ||
| "count": 0 | ||
| }, | ||
| "referrer": "", | ||
| "resource": { | ||
| "count": 3 | ||
| }, | ||
| "time_spent": 3120000000, | ||
| "url": "http://localhost:8080/test.html" | ||
| }, | ||
| "_dd": { | ||
| "document_version": 2, | ||
| "drift": 0, | ||
| "format_version": 2, | ||
| "session": { | ||
| "plan": 2 | ||
| } | ||
| } | ||
| }, | ||
| "tags": [ | ||
| "browser_sdk_version:3.6.13" | ||
| ] | ||
| } | ||
| """ | ||
|
|
||
| // When | ||
| RUMMonitor.shared(in: core).startView(key: "web-view") | ||
| controller.send(body: body) | ||
| controller.flush() | ||
|
|
||
| // Then | ||
| let expectedUUID = randomUUID.uuidString.lowercased() | ||
| let rumMatcher = try XCTUnwrap(core.waitAndReturnRUMEventMatchers().last) | ||
| try rumMatcher.assertItFullyMatches(jsonString: """ | ||
| { | ||
| "application": { | ||
| "id": "\(randomApplicationID)" | ||
| }, | ||
| "date": \(1_635_932_927_012 + 123.toInt64Milliseconds), | ||
| "service": "super", | ||
| "session": { | ||
| "id": "\(expectedUUID)", | ||
| "type": "user" | ||
| }, | ||
| "type": "view", | ||
| "view": { | ||
| "action": { | ||
| "count": 0 | ||
| }, | ||
| "cumulative_layout_shift": 0, | ||
| "dom_complete": 152800000, | ||
| "dom_content_loaded": 118300000, | ||
| "dom_interactive": 116400000, | ||
| "error": { | ||
| "count": 0 | ||
| }, | ||
| "first_contentful_paint": 121300000, | ||
| "id": "64308fd4-83f9-48cb-b3e1-1e91f6721230", | ||
| "in_foreground_periods": [], | ||
| "is_active": true, | ||
| "largest_contentful_paint": 121299000, | ||
| "load_event": 152800000, | ||
| "loading_time": 152800000, | ||
| "loading_type": "initial_load", | ||
| "long_task": { | ||
| "count": 0 | ||
| }, | ||
| "referrer": "", | ||
| "resource": { | ||
| "count": 3 | ||
| }, | ||
| "time_spent": 3120000000, | ||
| "url": "http://localhost:8080/test.html" | ||
| }, | ||
| "_dd": { | ||
| "document_version": 2, | ||
| "drift": 0, | ||
| "format_version": 2, | ||
| "session": { | ||
| "plan": 1 | ||
| } | ||
| } | ||
| } | ||
| """ | ||
| ) | ||
| } | ||
|
|
||
| func testWebTelemetryIntegration() throws { | ||
| // Given | ||
| let randomApplicationID: String = .mockRandom() | ||
| let randomUUID: UUID = .mockRandom() | ||
|
|
||
| RUM.enable(with: .mockWith(applicationID: randomApplicationID) { | ||
| $0.uuidGenerator = RUMUUIDGeneratorMock(uuid: randomUUID) | ||
| }, in: core) | ||
|
|
||
| let body = """ | ||
| { | ||
| "eventType": "internal_telemetry", | ||
| "event": | ||
| { | ||
| "type": "telemetry", | ||
| "date": 1712069357432, | ||
| "service": "browser-rum-sdk", | ||
| "version": "5.2.0-b93ed472a4f14fbf2bcd1bc2c9faacb4abbeed82", | ||
| "source": "browser", | ||
| "_dd": { "format_version": 2 }, | ||
| "telemetry": | ||
| { | ||
| "type": "configuration", | ||
| "configuration": | ||
| { | ||
| "session_replay_sample_rate": 100, | ||
| "use_allowed_tracing_urls": false, | ||
| "selected_tracing_propagators": [], | ||
| "default_privacy_level": "allow", | ||
| "use_excluded_activity_urls": false, | ||
| "use_worker_url": false, | ||
| "track_user_interactions": true, | ||
| "track_resources": true, | ||
| "track_long_task": true, | ||
| "session_sample_rate": 100, | ||
| "telemetry_sample_rate": 100, | ||
| "use_before_send": false, | ||
| "use_proxy": false, | ||
| "allow_fallback_to_local_storage": false, | ||
| "store_contexts_across_pages": false, | ||
| "allow_untrusted_events": false | ||
| }, | ||
| "runtime_env": { "is_local_file": false, "is_worker": false } | ||
| }, | ||
| "experimental_features": [], | ||
| "application": { "id": "00000000-aaaa-0000-aaaa-000000000000" }, | ||
| "session": { "id": "00000000-aaaa-0000-aaaa-000000000000" }, | ||
| "view": {}, | ||
| "action": { "id": [] } | ||
| } | ||
| } | ||
| """ | ||
|
|
||
| // When | ||
| RUMMonitor.shared(in: core).startView(key: "web-view") | ||
| controller.send(body: body) | ||
| controller.flush() | ||
|
|
||
| // Then | ||
| let expectedUUID = randomUUID.uuidString.lowercased() | ||
| let rumMatcher = try XCTUnwrap(core.waitAndReturnRUMEventMatchers().last) | ||
| try rumMatcher.assertItFullyMatches(jsonString: """ | ||
| { | ||
| "type": "telemetry", | ||
| "date": \(1_712_069_357_432 + 123.toInt64Milliseconds), | ||
| "service": "browser-rum-sdk", | ||
| "version": "5.2.0-b93ed472a4f14fbf2bcd1bc2c9faacb4abbeed82", | ||
| "source": "browser", | ||
| "_dd": { "format_version": 2 }, | ||
| "telemetry": | ||
| { | ||
| "type": "configuration", | ||
| "configuration": | ||
| { | ||
| "session_replay_sample_rate": 100, | ||
| "use_allowed_tracing_urls": false, | ||
| "selected_tracing_propagators": [], | ||
| "default_privacy_level": "allow", | ||
| "use_excluded_activity_urls": false, | ||
| "use_worker_url": false, | ||
| "track_user_interactions": true, | ||
| "track_resources": true, | ||
| "track_long_task": true, | ||
| "session_sample_rate": 100, | ||
| "telemetry_sample_rate": 100, | ||
| "use_before_send": false, | ||
| "use_proxy": false, | ||
| "allow_fallback_to_local_storage": false, | ||
| "store_contexts_across_pages": false, | ||
| "allow_untrusted_events": false | ||
| }, | ||
| "runtime_env": { "is_local_file": false, "is_worker": false } | ||
| }, | ||
| "experimental_features": [], | ||
| "application": { "id": "\(randomApplicationID)" }, | ||
| "session": { "id": "\(expectedUUID)" }, | ||
| "view": {}, | ||
| "action": { "id": [] } | ||
| } | ||
| """ | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| #endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| /* | ||
| * Unless explicitly stated otherwise all files in this repository are licensed under the Apache License Version 2.0. | ||
| * This product includes software developed at Datadog (https://www.datadoghq.com/). | ||
| * Copyright 2019-Present Datadog, Inc. | ||
| */ | ||
|
|
||
| import Foundation | ||
|
|
||
| /// Represents the type of TLV block used in Data Store files. | ||
| internal enum DataStoreBlockType: UInt16 { | ||
| /// The version of data format in `data` block. | ||
| case version = 0x00 | ||
| /// The actual data stored in the file. | ||
| case data = 0x01 | ||
| } | ||
|
|
||
| /// Represents a TLV data block stored in data store files. | ||
| internal typealias DataStoreBlock = TLVBlock<DataStoreBlockType> | ||
|
|
||
| /// Represents a TLV reader for data store files. | ||
| internal typealias DataStoreBlockReader = TLVBlockReader<DataStoreBlockType> |
Oops, something went wrong.