fix: Callback issue for auto performance #1275
Merged
Conversation
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
The auto performance instrumentation was sometimes not calling the original method of the swizzled UIViewController, which lead to crashes. This is fixed now, by always calling the callback for every swizzled method.
philipphofmann
commented
Aug 19, 2021
Comment on lines
+42
to
+68
| [self limitOverride:@"loadView" | ||
| target:controller | ||
| callbackToOrigin:callbackToOrigin | ||
| block:^{ | ||
| SentrySpanId *spanId = objc_getAssociatedObject( | ||
| controller, &SENTRY_UI_PERFORMANCE_TRACKER_SPAN_ID); | ||
|
|
||
| // If the user manually call loadView outside the lifecycle | ||
| // we don't start a new transaction and override the previous id stored. | ||
| if (spanId == nil) { | ||
| NSString *name = [SentryUIViewControllerSanitizer | ||
| sanitizeViewControllerName:controller]; | ||
| spanId = [self.tracker | ||
| startSpanWithName:name | ||
| operation:SENTRY_VIEWCONTROLLER_RENDERING_OPERATION]; | ||
|
|
||
| // use the target itself to store the spanId to avoid using a global | ||
| // mapper. | ||
| objc_setAssociatedObject(controller, | ||
| &SENTRY_UI_PERFORMANCE_TRACKER_SPAN_ID, spanId, | ||
| OBJC_ASSOCIATION_RETAIN_NONATOMIC); | ||
| } | ||
|
|
||
| [self measurePerformance:@"loadView" | ||
| target:controller | ||
| callbackToOrigin:callbackToOrigin]; | ||
| }]; |
There was a problem hiding this comment.
I didn't change anything in this big block and the other blocks below. I just renamed the parameter. Scroll down until my next comment for the actual change in this file.
| @@ -228,7 +237,9 @@ - (void)viewControllerViewDidLayoutSubViews:(UIViewController *)controller | |||
| */ | |||
| - (void)limitOverride:(NSString *)description | |||
| target:(UIViewController *)viewController | |||
| callbackToOrigin:(void (^)(void))callbackToOrigin | |||
There was a problem hiding this comment.
You made it, here are the real changes in this file.
Codecov Report
@@ Coverage Diff @@
## master #1275 +/- ##
==========================================
+ Coverage 95.62% 95.64% +0.02%
==========================================
Files 150 150
Lines 5349 5354 +5
==========================================
+ Hits 5115 5121 +6
+ Misses 234 233 -1
Continue to review full report at Codecov.
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
📜 Description
The auto performance instrumentation was sometimes not calling the original
method of the swizzled UIViewController, which lead to crashes. This is fixed now,
by always calling the callback for every swizzled method.
💡 Motivation and Context
A customer reported getting crashes from Sentry when upgrading to 7.2.0, which they didn't have in 7.1.4.
💚 How did you test it?
Unit tests.
📝 Checklist
🔮 Next steps