-
Notifications
You must be signed in to change notification settings - Fork 70
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
Add os_signpost logs for render() and Workflow and Worker lifecycle #1134
Merged
Merged
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
0443426
Add os_signpost logs for render() and Workflow and Worker lifecycle
AquaGeek bbd949a
Rename Log.swift -> OSLog+Workflow.swift
AquaGeek cc261ac
Rename 'Worker Created' to 'Running'
AquaGeek ebbfe08
Log Worker events
AquaGeek 2239cc5
Consolidate all the os_signpost calls
AquaGeek 935f09f
Rename OSLog+Workflow.swift -> WorkflowLogger.swift
AquaGeek 169f6ff
Change events to log the Workflow/Worker type instead of a descriptio…
AquaGeek 7e250b0
Require status for 'worker finished' logging
AquaGeek 8d53983
Created a class to be used as a signpost ref instead of NSObject
AquaGeek 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,98 @@ | ||
/* | ||
* Copyright 2020 Square Inc. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
import os.signpost | ||
|
||
fileprivate extension OSLog { | ||
static let workflow = OSLog(subsystem: "com.squareup.Workflow", category: "Workflow") | ||
static let worker = OSLog(subsystem: "com.squareup.Workflow", category: "Worker") | ||
} | ||
|
||
// MARK: - | ||
|
||
/// Simple class that can be used to create signpost IDs based on an object pointer. | ||
final class SignpostRef { | ||
init() {} | ||
} | ||
|
||
final class WorkflowLogger { | ||
// MARK: Workflows | ||
|
||
static func logWorkflowStarted<WorkflowType>(ref: WorkflowNode<WorkflowType>) { | ||
if #available(iOS 12.0, macOS 10.14, *) { | ||
let signpostID = OSSignpostID(log: .workflow, object: ref) | ||
os_signpost(.begin, log: .workflow, name: "Alive", signpostID: signpostID, | ||
"Workflow: %{public}@", String(describing: WorkflowType.self)) | ||
} | ||
} | ||
|
||
static func logWorkflowFinished<WorkflowType>(ref: WorkflowNode<WorkflowType>) { | ||
if #available(iOS 12.0, macOS 10.14, *) { | ||
let signpostID = OSSignpostID(log: .workflow, object: ref) | ||
os_signpost(.end, log: .workflow, name: "Alive", signpostID: signpostID) | ||
} | ||
} | ||
|
||
static func logSinkEvent<Action: WorkflowAction>(ref: AnyObject, action: Action) { | ||
if #available(iOS 12.0, macOS 10.14, *) { | ||
let signpostID = OSSignpostID(log: .workflow, object: ref) | ||
os_signpost(.event, log: .workflow, name: "Sink Event", signpostID: signpostID, | ||
"Event for workflow: %{public}@", String(describing: Action.WorkflowType.self)) | ||
} | ||
} | ||
|
||
// MARK: Rendering | ||
|
||
static func logWorkflowStartedRendering<WorkflowType>(ref: WorkflowNode<WorkflowType>) { | ||
if #available(iOS 12.0, macOS 10.14, *) { | ||
let signpostID = OSSignpostID(log: .workflow, object: ref) | ||
os_signpost(.begin, log: .workflow, name: "Render", signpostID: signpostID, | ||
"Render Workflow: %{public}@", String(describing: WorkflowType.self)) | ||
} | ||
} | ||
|
||
static func logWorkflowFinishedRendering<WorkflowType>(ref: WorkflowNode<WorkflowType>) { | ||
if #available(iOS 12.0, macOS 10.14, *) { | ||
let signpostID = OSSignpostID(log: .workflow, object: ref) | ||
os_signpost(.end, log: .workflow, name: "Render", signpostID: signpostID) | ||
} | ||
} | ||
|
||
// MARK: - Workers | ||
|
||
static func logWorkerStartedRunning<WorkerType>(ref: AnyObject, workerType: WorkerType.Type) { | ||
if #available(iOS 12.0, macOS 10.14, *) { | ||
let signpostID = OSSignpostID(log: .worker, object: ref) | ||
os_signpost(.begin, log: .worker, name: "Running", signpostID: signpostID, | ||
"Worker: %{public}@", String(describing: WorkerType.self)) | ||
} | ||
} | ||
|
||
static func logWorkerFinishedRunning(ref: AnyObject, status: StaticString) { | ||
if #available(iOS 12.0, macOS 10.14, *) { | ||
let signpostID = OSSignpostID(log: .worker, object: ref) | ||
os_signpost(.end, log: .worker, name: "Running", signpostID: signpostID, status) | ||
} | ||
} | ||
|
||
static func logWorkerOutput<WorkerType: Worker>(ref: AnyObject, workerType: WorkerType.Type) { | ||
if #available(iOS 12.0, macOS 10.14, *) { | ||
let signpostID = OSSignpostID(log: .worker, object: ref) | ||
os_signpost(.event, log: .worker, name: "Worker Event", signpostID: signpostID, | ||
"Event: %{public}@", String(describing: WorkerType.self)) | ||
} | ||
} | ||
} |
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
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.
Does it make sense to log an event to indicate a worker emitted a value and it's about to be handled? So you would see that the worker emitted the event, and then it was mapped and handled by a sink?
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.
Maybe move the logging to a different function.
logWorkerState(event:)
?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'm exploring using
.on(…)
in the stream (similar to what.logEvents
does). I'll update this soon.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.
Did the
.on(..)
work out?