Flush Logs on WillTerminate or WillResignActive Notifications
#6909
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
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
File renamed without changes.
File renamed without changes.
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,82 @@ | ||
| @_implementationOnly import _SentryPrivate | ||
|
|
||
| #if (os(iOS) || os(tvOS) || (swift(>=5.9) && os(visionOS))) && !SENTRY_NO_UIKIT | ||
| import UIKit | ||
| private typealias CrossPlatformApplication = UIApplication | ||
| #elseif os(macOS) | ||
| import AppKit | ||
| private typealias CrossPlatformApplication = NSApplication | ||
| #endif | ||
cursor[bot] marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| #if ((os(iOS) || os(tvOS) || (swift(>=5.9) && os(visionOS))) && !SENTRY_NO_UIKIT) || os(macOS) | ||
|
|
||
| protocol NotificationCenterProvider { | ||
| var notificationCenterWrapper: SentryNSNotificationCenterWrapper { get } | ||
| } | ||
|
|
||
| final class FlushLogsIntegration<Dependencies: NotificationCenterProvider>: NSObject, SwiftIntegration { | ||
|
|
||
| private let notificationCenter: SentryNSNotificationCenterWrapper | ||
|
|
||
| init?(with options: Options, dependencies: Dependencies) { | ||
| guard options.enableLogs else { | ||
| return nil | ||
| } | ||
|
|
||
| self.notificationCenter = dependencies.notificationCenterWrapper | ||
|
|
||
| super.init() | ||
|
|
||
| notificationCenter.addObserver( | ||
| self, | ||
| selector: #selector(willResignActive), | ||
| name: CrossPlatformApplication.willResignActiveNotification, | ||
| object: nil | ||
| ) | ||
|
|
||
| notificationCenter.addObserver( | ||
| self, | ||
| selector: #selector(willTerminate), | ||
| name: CrossPlatformApplication.willTerminateNotification, | ||
| object: nil | ||
| ) | ||
| } | ||
|
|
||
| func uninstall() { | ||
| notificationCenter.removeObserver( | ||
| self, | ||
| name: CrossPlatformApplication.willResignActiveNotification, | ||
| object: nil | ||
| ) | ||
|
|
||
| notificationCenter.removeObserver( | ||
| self, | ||
| name: CrossPlatformApplication.willTerminateNotification, | ||
| object: nil | ||
| ) | ||
| } | ||
|
|
||
| deinit { | ||
| uninstall() | ||
| } | ||
|
|
||
| @objc private func willResignActive() { | ||
| guard let client = SentrySDKInternal.currentHub().getClient() else { | ||
| return | ||
|
Member
There was a problem hiding this comment.
|
||
| } | ||
| client.captureLogs() | ||
| } | ||
|
|
||
| @objc private func willTerminate() { | ||
| guard let client = SentrySDKInternal.currentHub().getClient() else { | ||
| return | ||
| } | ||
| client.captureLogs() | ||
| } | ||
|
|
||
| static var name: String { | ||
| "FlushLogsIntegration" | ||
| } | ||
| } | ||
|
|
||
| #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
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
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.
m: Thanks for adding an extra dispatch queue. What bugs me a bit is that theSentryLogBatcherspecifically needs the dispatch queue above to work correctly, so the init of this specific DispatchQueueWrapper should be in theSentryLogBatcher.swiftfile if possible, IMO. What about removing the SentryDispatchQueueWrapper param from the convenience init and let the convenience init create the SentryDispatchQueueWrapper. We anyways use the other init method for tests.