Skip to content

Commit

Permalink
fixing merge
Browse files Browse the repository at this point in the history
  • Loading branch information
brustolin committed Apr 21, 2022
1 parent 41fab1d commit 8dd82d4
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions Sources/Sentry/SentryClient.m
Original file line number Diff line number Diff line change
Expand Up @@ -145,15 +145,15 @@ - (SentryId *)captureException:(NSException *)exception

- (SentryId *)captureException:(NSException *)exception withScope:(SentryScope *)scope
{
SentryEvent *event = [self buildExceptionEvent:exception scope:scope];
SentryEvent *event = [self buildExceptionEvent:exception];
return [self sendEvent:event withScope:scope alwaysAttachStacktrace:YES];
}

- (SentryId *)captureException:(NSException *)exception
withSession:(SentrySession *)session
withScope:(SentryScope *)scope
{
SentryEvent *event = [self buildExceptionEvent:exception scope:scope];
SentryEvent *event = [self buildExceptionEvent:exception];
event = [self prepareEvent:event withScope:scope alwaysAttachStacktrace:YES];
return [self sendEvent:event withSession:session withScope:scope];
}
Expand All @@ -176,15 +176,15 @@ - (SentryId *)captureError:(NSError *)error

- (SentryId *)captureError:(NSError *)error withScope:(SentryScope *)scope
{
SentryEvent *event = [self buildErrorEvent:error scope:scope];
SentryEvent *event = [self buildErrorEvent:error];
return [self sendEvent:event withScope:scope alwaysAttachStacktrace:YES];
}

- (SentryId *)captureError:(NSError *)error
withSession:(SentrySession *)session
withScope:(SentryScope *)scope
{
SentryEvent *event = [self buildErrorEvent:error scope:scope];
SentryEvent *event = [self buildErrorEvent:error];
event = [self prepareEvent:event withScope:scope alwaysAttachStacktrace:YES];
return [self sendEvent:event withSession:session withScope:scope];
}
Expand Down
4 changes: 2 additions & 2 deletions Tests/SentryTests/SentryClientTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -255,8 +255,8 @@ class SentryClientTest: XCTestCase {

let sentAttachments = fixture.transportAdapter.sentEventsWithSessionTraceState.first?.attachments ?? []

XCTAssertEqual(sendedAttachments.count, 1)
XCTAssertEqual(extraAttachment, sendedAttachments.first)
XCTAssertEqual(sentAttachments.count, 1)
XCTAssertEqual(extraAttachment, sentAttachments.first)
}

func test_AttachmentProcessor_CaptureError_WithSession_NoReleaseName() {
Expand Down

0 comments on commit 8dd82d4

Please sign in to comment.