Skip to content

[iOS] Drop network error events of resources marked as dropped (#1338) #1339

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
LinFeiLong wants to merge 1 commit into
base: develop
Choose a base branch
from
+114 −0
Draft

[iOS] Drop network error events of resources marked as dropped (#1338) #1339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions packages/core/ios/Sources/DdSdkNativeInitialization.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,14 @@ public class DdSdkNativeInitialization: NSObject {
}
return actionEvent
},
errorEventMapper: { errorEvent in
if errorEvent.context?.contextInfo[InternalConfigurationAttributes.dropResource]
!= nil
{
return nil
}
return errorEvent
},
onSessionStart: DdSdkSessionStartedListener.instance.rumSessionListener,
customEndpoint: customRUMEndpointURL,
trackMemoryWarnings: rumConfig.trackMemoryWarnings
Expand Down
18 changes: 18 additions & 0 deletions packages/core/ios/Tests/DdSdkTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1609,6 +1609,24 @@ class DdSdkTests: XCTestCase {
XCTAssertNotNil(mappedEvent)
}

func testDropsErrorMarkedAsDropped() throws {
let configuration: DdSdkConfiguration = .mockAny()

let ddConfig = DdSdkNativeInitialization().buildRumConfiguration(
configuration: configuration
)

let errorEventMapper = try XCTUnwrap(ddConfig.errorEventMapper)

let mockDroppedErrorEvent = RUMErrorEvent.mockRandomDropped()
let mappedDroppedEvent = errorEventMapper(mockDroppedErrorEvent)
XCTAssertNil(mappedDroppedEvent)

let mockErrorEvent = RUMErrorEvent.mockRandom()
let mappedEvent = errorEventMapper(mockErrorEvent)
XCTAssertNotNil(mappedEvent)
}

func testReactNativeThreadMonitorsRunOnBridge() throws {
let bridge = DispatchQueueMock()
let mockJSRefreshRateMonitor = MockJSRefreshRateMonitor()
Expand Down
88 changes: 88 additions & 0 deletions packages/core/ios/Tests/RUMMocks.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,6 +514,94 @@ extension RUMActionEvent: RandomMockable {
}
}

extension RUMErrorEvent: RandomMockable {
static func mockRandomDropped() -> RUMErrorEvent {
return RUMErrorEvent(
dd: .init(
browserSdkVersion: nil,
configuration: nil,
session: .init(plan: .plan1, sessionPrecondition: nil)
),
application: .init(id: .mockRandom()),
buildId: nil,
buildVersion: nil,
ciTest: nil,
connectivity: .mockRandom(),
container: nil,
context: .init(contextInfo: ["_dd.resource.drop_resource": true] ),
date: .mockRandom(),
device: .mockRandom(),
display: nil,
error: .init(
isCrash: false,
message: .mockRandom(),
source: .network,
stack: .mockRandom()
),
os: .mockRandom(),
service: .mockRandom(),
session: .init(
hasReplay: nil,
id: .mockRandom(),
type: .user
),
source: .ios,
synthetics: nil,
usr: .mockRandom(),
version: .mockRandom(),
view: .init(
id: .mockRandom(),
inForeground: .random(),
referrer: .mockRandom(),
url: .mockRandom()
)
)
}

static func mockRandom() -> RUMErrorEvent {
return RUMErrorEvent(
dd: .init(
browserSdkVersion: nil,
configuration: nil,
session: .init(plan: .plan1, sessionPrecondition: nil)
),
application: .init(id: .mockRandom()),
buildId: nil,
buildVersion: nil,
ciTest: nil,
connectivity: .mockRandom(),
container: nil,
context: nil,
date: .mockRandom(),
device: .mockRandom(),
display: nil,
error: .init(
isCrash: false,
message: .mockRandom(),
source: .network,
stack: .mockRandom()
),
os: .mockRandom(),
service: .mockRandom(),
session: .init(
hasReplay: nil,
id: .mockRandom(),
type: .user
),
source: .ios,
synthetics: nil,
usr: .mockRandom(),
version: .mockRandom(),
view: .init(
id: .mockRandom(),
inForeground: .random(),
referrer: .mockRandom(),
url: .mockRandom()
)
)
}
}

// MARK: - URLRequest Mocks

extension URLRequest {
Expand Down