chore: Convert SentryFramesTrackingIntegration to Swift
#7044
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 |
|---|---|---|
|
|
@@ -154,42 +154,6 @@ - (BOOL)shouldBeEnabledWithOptions:(SentryOptions *)options | |
| } | ||
| #endif | ||
|
|
||
| return YES; | ||
| } | ||
|
|
||
|
|
||
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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,49 @@ | ||
| @_implementationOnly import _SentryPrivate | ||
|
|
||
| #if (os(iOS) || os(tvOS) || os(visionOS)) && !SENTRY_NO_UIKIT | ||
|
|
||
| final class SentryFramesTrackingIntegration<Dependencies: FramesTrackingProvider>: NSObject, SwiftIntegration { | ||
| let tracker: SentryFramesTracker | ||
|
|
||
| init?(with options: Options, dependencies: Dependencies) { | ||
| // Check hybrid SDK mode first - if enabled, always start frames tracking | ||
| if !PrivateSentrySDKOnly.framesTrackingMeasurementHybridSDKMode { | ||
|
Member
There was a problem hiding this comment.
Contributor
Author
There was a problem hiding this comment. Looks like I forgot to remove the old code. |
||
|
|
||
| // Check if frames tracking should be enabled based on options | ||
| let performanceDisabled = !options.enableAutoPerformanceTracing || !options.isTracingEnabled | ||
| let appHangsDisabled = options.isAppHangTrackingDisabled() | ||
| let watchdogDisabled = !options.enableWatchdogTerminationTracking | ||
|
|
||
| // The watchdog tracker uses the frames tracker, so frame tracking | ||
| // must be enabled if watchdog tracking is enabled. | ||
| if performanceDisabled && appHangsDisabled && watchdogDisabled { | ||
| if appHangsDisabled { | ||
| SentrySDKLog.debug("Not going to enable \(Self.name) because enableAppHangTracking is disabled or the appHangTimeoutInterval is 0.") | ||
| } | ||
|
|
||
| if performanceDisabled { | ||
| SentrySDKLog.debug("Not going to enable \(Self.name) because enableAutoPerformanceTracing and isTracingEnabled are disabled.") | ||
| } | ||
|
|
||
| if watchdogDisabled { | ||
| SentrySDKLog.debug("Not going to enable \(Self.name) because enableWatchdogTerminationTracking is disabled.") | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
| } | ||
|
|
||
| tracker = dependencies.framesTracker | ||
| tracker.start() | ||
| } | ||
|
|
||
| func uninstall() { | ||
| tracker.stop() | ||
| } | ||
|
|
||
| static var name: String { | ||
| "SentryFramesTrackingIntegration" | ||
| } | ||
| } | ||
|
|
||
| #endif | ||
This file contains hidden or 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
Oops, something went wrong.
Oops, something went wrong.
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.
Integration order change breaks frames tracker dependency
The conversion moves
SentryFramesTrackingIntegrationfrom ObjC integrations to Swift integrations, which changes when it's installed. Previously it was installed early, beforeSentryWatchdogTerminationTrackingIntegration. Now Swift integrations are installed after all ObjC integrations, so the frames tracker starts after the watchdog termination integration. SinceSentryANRTrackerV2(used by watchdog tracking) depends on the frames tracker to compute frame delays, callinggetFramesDelaySPIreturns-1whenisRunningisfalse, causing ANR detection to skip frames-based analysis until the Swift integrations complete installation. The comment in the old code states "the watchdog tracker uses the frames tracker, so frame tracking must be enabled if watchdog tracking is enabled."Additional Locations (1)
Sources/Sentry/SentrySDKInternal.m#L514-L517There 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.
Interesting, worth checking out