-
Notifications
You must be signed in to change notification settings - Fork 23
[AC]: add verbose logging #397
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
Draft
kieran-osgood-shopify
wants to merge
11
commits into
main
Choose a base branch
from
kieran-osgood/feat/add-verbose-logging
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
b881bce
feat: setup extended logging
kieran-osgood-shopify f2586f4
temp
kieran-osgood-shopify 489f5f4
dev fix
kieran-osgood-shopify dc86423
fix: broken tests and dev lint
kieran-osgood-shopify 239e7f5
refactor: add more logging to buttons - remove logging from execute
kieran-osgood-shopify 594d90d
update logger implementation to include namespaces
kieran-osgood-shopify 8ae7190
feat(Loggable): increase testing
kieran-osgood-shopify 716896b
refactor(Loggable): use same OSLogger instance - use loggable everywhere
kieran-osgood-shopify 1f8ac8a
refactor: remove redundant method argument to loggable
kieran-osgood-shopify dd6f675
refactor: remove unnecessary logs
kieran-osgood-shopify 4ee8320
fix: missing Loggable extension
kieran-osgood-shopify 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 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
124 changes: 124 additions & 0 deletions
124
Sources/ShopifyAcceleratedCheckouts/Internal/Utilities/Loggable.swift
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,124 @@ | ||
| /* | ||
| MIT License | ||
|
|
||
| Copyright 2023 - Present, Shopify Inc. | ||
|
|
||
| Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| of this software and associated documentation files (the "Software"), to deal | ||
| in the Software without restriction, including without limitation the rights | ||
| to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| copies of the Software, and to permit persons to whom the Software is | ||
| furnished to do so, subject to the following conditions: | ||
|
|
||
| The above copyright notice and this permission notice shall be included in all | ||
| copies or substantial portions of the Software. | ||
|
|
||
| THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| */ | ||
|
|
||
| import Foundation | ||
| import ShopifyCheckoutSheetKit | ||
|
|
||
| /// Protocol for components that need logging with automatic namespace detection | ||
| @available(iOS 16.0, *) | ||
| internal protocol Loggable { | ||
| // var osLogger: OSLogger { get set } | ||
| } | ||
|
|
||
| /// Default implementation for Loggable protocol | ||
| @available(iOS 16.0, *) | ||
| extension Loggable { | ||
| internal var osLogger: OSLogger { | ||
| ShopifyAcceleratedCheckouts.logger.osLogger | ||
| } | ||
|
|
||
| /// Returns the name of the conforming class | ||
| /// | ||
| /// Usage: | ||
| /// ```swift | ||
| /// class MyClass : Loggable { | ||
| /// func foo() { | ||
| /// print(namespace) // prints: 'MyClass' | ||
| /// } | ||
| /// } | ||
| /// ``` | ||
| internal var namespace: String { | ||
| String(describing: type(of: self)) | ||
| } | ||
|
|
||
| internal func createLogLine( | ||
| _ message: String, | ||
| method: String, | ||
| fileID: String, | ||
| line: Int | ||
| ) -> String { | ||
| let fileName = fileID.split(separator: "/").last.map { String($0) } ?? fileID | ||
| return "[\(fileName):\(method):\(line)] \(message)" | ||
| } | ||
|
|
||
| /// Log a debug message with automatic namespace | ||
| internal func logDebug( | ||
| _ message: String, | ||
| method: String = #function, | ||
| fileID: String = #fileID, | ||
| line: Int = #line | ||
| ) { | ||
| osLogger.debug( | ||
| createLogLine(message, method: method, fileID: fileID, line: line) | ||
| ) | ||
| } | ||
|
|
||
| /// Log an info message with automatic namespace | ||
| internal func logInfo( | ||
| _ message: String, | ||
| method: String = #function, | ||
| fileID: String = #fileID, | ||
| line: Int = #line | ||
| ) { | ||
| osLogger.info( | ||
| createLogLine(message, method: method, fileID: fileID, line: line) | ||
| ) | ||
| } | ||
|
|
||
| /// Log an error message with automatic namespace | ||
| internal func logError( | ||
| _ message: String, | ||
| method: String = #function, | ||
| fileID: String = #fileID, | ||
| line: Int = #line | ||
| ) { | ||
| osLogger.error( | ||
| createLogLine(message, method: method, fileID: fileID, line: line) | ||
| ) | ||
| } | ||
|
|
||
| /// Log a fault message with automatic namespace | ||
| internal func logFault( | ||
| _ message: String, | ||
| method: String = #function, | ||
| fileID: String = #fileID, | ||
| line: Int = #line | ||
| ) { | ||
| osLogger.fault( | ||
| createLogLine(message, method: method, fileID: fileID, line: line) | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| @available(iOS 16.0, *) | ||
| internal class Logger: Loggable { | ||
| var osLogger: ShopifyCheckoutSheetKit.OSLogger | ||
|
|
||
| init(prefix: String, logLevel: LogLevel) { | ||
| osLogger = OSLogger(prefix: prefix, logLevel: logLevel) | ||
| } | ||
|
|
||
| func setLogLevel(to logLevel: LogLevel) { | ||
| osLogger.logLevel = logLevel | ||
| } | ||
| } |
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.
can't conform the Structs to Loggable so also using global here