-
Notifications
You must be signed in to change notification settings - Fork 130
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.
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
Capture trace of error reporting thread and identify with boolean flag #303
Merged
Merged
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
0dc72b2
feat: capture crashing thread in json payload and add boolean flag to…
fractalwrench 775ea83
add changelog entry
fractalwrench 1b832c0
style: reword crashedThread -> reportingThread
fractalwrench 44b266b
test: add test that ensures only 1 error reporting thread is sent in …
fractalwrench c3b7491
Merge branch 'next' into thread-id
fractalwrench File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
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
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,90 @@ | ||
| // | ||
| // Created by Jamie Lynch on 02/08/2018. | ||
| // Copyright (c) 2018 Bugsnag. All rights reserved. | ||
| // | ||
|
|
||
| #import <Foundation/Foundation.h> | ||
| #import <XCTest/XCTest.h> | ||
|
|
||
| #import "BugsnagCrashReport.h" | ||
|
|
||
| @interface BugsnagThreadTest : XCTestCase | ||
| @end | ||
|
|
||
| @interface BugsnagCrashReport () | ||
| - (NSArray *)serializeThreadsWithException:(NSMutableDictionary *)exception; | ||
|
|
||
| @property(nonatomic, readonly, copy, nullable) NSArray *threads; | ||
| @end | ||
|
|
||
| @implementation BugsnagThreadTest | ||
|
|
||
| - (void)testEmptyThreads { | ||
| BugsnagCrashReport *report = [self generateReportWithThreads:@[]]; | ||
| NSArray *threads = [report serializeThreadsWithException:nil]; | ||
| XCTAssertTrue(threads.count == 0); | ||
| } | ||
|
|
||
| - (void)testThreadSerialisation { | ||
| NSArray *trace = @[ | ||
| @{ | ||
| @"backtrace": @{ | ||
| @"contents": @[ | ||
| @{ | ||
| @"instruction_addr": @4438096107, | ||
| @"object_addr": @4438048768, | ||
| @"object_name": @"Bugsnag Test App", | ||
| @"symbol_addr": @4438048768, | ||
| @"symbol_name": @"_mh_execute_header", | ||
| } | ||
| ], | ||
| @"skipped": @NO, | ||
| }, | ||
| @"crashed": @YES, | ||
| @"current_thread": @YES, | ||
| @"index": @0 | ||
| }, | ||
| @{ | ||
| @"backtrace": @{ | ||
| @"contents": @[ | ||
| @{ | ||
| @"instruction_addr": @4510040722, | ||
| @"object_addr": @4509921280, | ||
| @"object_name": @"libsystem_kernel.dylib", | ||
| @"symbol_addr": @4510040712, | ||
| @"symbol_name": @"__workq_kernreturn", | ||
| } | ||
| ], | ||
| @"skipped": @NO, | ||
| }, | ||
| @"crashed": @NO, | ||
| @"current_thread": @NO, | ||
| @"index": @1 | ||
| }, | ||
| ]; | ||
|
|
||
| BugsnagCrashReport *report = [self generateReportWithThreads:trace]; | ||
| NSArray *threads = [report serializeThreadsWithException:nil]; | ||
| XCTAssertTrue(threads.count == 2); | ||
|
|
||
| // first thread is crashed, should be serialised and contain 'errorReportingThread' flag | ||
| NSDictionary *firstThread = threads[0]; | ||
| XCTAssertEqualObjects(@0, firstThread[@"id"]); | ||
| XCTAssertEqualObjects(@"cocoa", firstThread[@"type"]); | ||
| XCTAssertNotNil(firstThread[@"stacktrace"]); | ||
| XCTAssertTrue(firstThread[@"errorReportingThread"]); | ||
|
|
||
| // second thread is not crashed, should not contain 'errorReportingThread' flag | ||
| NSDictionary *secondThread = threads[1]; | ||
| XCTAssertEqualObjects(@1, secondThread[@"id"]); | ||
| XCTAssertEqualObjects(@"cocoa", secondThread[@"type"]); | ||
| XCTAssertNotNil(secondThread[@"stacktrace"]); | ||
| XCTAssertNil(secondThread[@"errorReportingThread"]); | ||
| } | ||
|
|
||
| - (BugsnagCrashReport *)generateReportWithThreads:(NSArray *)threads { | ||
| return [[BugsnagCrashReport alloc] initWithKSReport:@{@"crash": @{@"threads": threads}}]; | ||
| } | ||
|
|
||
|
|
||
| @end |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would be careful to call this the reportingThread or the currentThread to emphasize that its not the crashing thread in all cases.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This makes sense - I've updated the parameter name.