-
Notifications
You must be signed in to change notification settings - Fork 485
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
feat(cwl): Add clear screen and stop session code lens #5958
Conversation
|
@@ -32,32 +32,29 @@ export async function tailLogGroup( | |||
region: wizardResponse.regionLogGroupSubmenuResponse.region, | |||
} | |||
const session = new LiveTailSession(liveTailSessionConfig) | |||
if (registry.has(session.uri)) { | |||
if (registry.has(session.uri.toString())) { |
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.
uriToKey
exists for this purpose.
aws-toolkit-vscode/packages/core/src/awsService/cloudWatchLogs/cloudWatchLogsUtils.ts
Line 33 in d4d1ae0
export function uriToKey(uri: vscode.Uri): string { |
toString
is not reliable, querystring parameters can appear in arbitrary order.
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.
aws-toolkit-vscode/packages/core/src/awsService/cloudWatchLogs/registry/logDataRegistry.ts
Lines 51 to 53 in d4d1ae0
public isRegistered(uri: vscode.Uri): boolean { | |
return this.registry.has(uriToKey(uri)) | |
} |
This makes me wonder why LiveTailSessionRegistry
is using a completely different pattern than LogDataRegistry
. Now we have two different "registries" concepts to maintain, using completely different patterns.
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 think the aim of these two registries are different from one another.
Given a LiveTail session has its own components unique to other CWL experiences (own client, abortController, responseStream, etc.) We have a LiveTailSession
object, that has a long running lifeCycle. This lifecycle can end from outside the TailLogGroup command, and so this registry is really just there to track what Sessions are currently running, so when a session needs to be closed via a CodeLens, or closing its textEditors, we can find the LiveTailSession from its uri
and abort the response stream and clean up its resources.
I think this is a separate responsiblity from the LogDataRegistry that is actually persisting LogData, and making requests to FilterLogEvents.
scheme: cloudwatchLogsLiveTailScheme, | ||
}, | ||
new LiveTailCodeLensProvider() |
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.
Why do we have a different scheme, and a different codelens, for "live tail"? The codelenses for the non-livetail log group search would be useful in live tail. Why are they separate?
Whether a log group is being "tailed" or not is just a flag. It's not an entirely different concept.
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.
The CodeLenses in the existing CWL experiences are not very applicable to our LiveTail use case.
"Load newer" & "Load older" don't apply when data is being streamed in constantly. For View full log stream
, customers can apply LogStream filter parameters to their liveTail session already so having this as a codeLens in a Livetail session doesn't seem necessary.
On the other hand, a SearchLogGroup
command won't need a Stop tailing
code lens.
These UX are quite separate.
We already separate the CodeLens providers for logData
and logStream
. Given the UX and functionality of LiveTail is different from our other experiences I think it fits to have a separate CodeLens provider.
This is the same reasoning behind having a separate scheme as we discussed here. The way we retrieve/display logs from a LiveTail session stream differs enough from the existing LogDataRegistry that I felt that it was best to separate these logic's, as opposed to finding a way to generalize.
I feel that LiveTail and the existing experiences are separate enough from each other that they should be treated as such.
packages/core/src/awsService/cloudWatchLogs/commands/tailLogGroup.ts
Outdated
Show resolved
Hide resolved
packages/core/src/awsService/cloudWatchLogs/commands/tailLogGroup.ts
Outdated
Show resolved
Hide resolved
…oup.ts Co-authored-by: Justin M. Keyes <[email protected]>
…oup.ts Co-authored-by: Justin M. Keyes <[email protected]>
Users may want to clear their screen during a tailing session. The liveTail document is read only. Users may want to stop their session without closing the document. Provide a codeLens to clear the screen (make document empty) Provide a codeLens to stop the session without closing the document. Moves Interval Timer for updating the StatusBar to the LiveTailSession object so `stopLiveTailSession()` can interrupt it, and be guaranteed to be cleaned up. The TextDocument's URI and Session URI seem to not be equal. Looking up in the LiveTailSessionRegistry with a document URI causes a session to not be found. Converting with `toString` allows these URIs to match and the registry to work as intended. Improves Exception handling on-stream. Previously, stopping the session in an expected fashion (codeLens, Closing editors) would cause an exception to bubble up and appear to the User. New change recognizes when the Abort Controller triggers, signifying an error has not occured, and logs the event as opposed to surfacing an error. Exposing only `isAborted` so that a caller has to use `stopLiveTailSession` to trigger the abortController and guarantee that other clean up actions have taken place.
Problem
Users may want to clear their screen during a tailing session. The liveTail document is read only.
Users may want to stop their session without closing the document.
Solution
Provide a codeLens to clear the screen (make document empty)
Provide a codeLens to stop the session without closing the document.
Moves Interval Timer for updating the StatusBar to the LiveTailSession object so
stopLiveTailSession()
can interrupt it, and be guaranteed to be cleaned up.The TextDocument's URI and Session URI seem to not be equal. Looking up in the LiveTailSessionRegistry with a document URI causes a session to not be found. Converting with
toString
allows these URIs to match and the registry to work as intended.Improves Exception handling on-stream. Previously, stopping the session in an expected fashion (codeLens, Closing editors) would cause an exception to bubble up and appear to the User. New change recognizes when the Abort Controller triggers, signifying an error has not occured, and logs the event as opposed to surfacing an error. Exposing only
isAborted
so that a caller has to usestopLiveTailSession
to trigger the abortController and guarantee that other clean up actions have taken place.License: I confirm that my contribution is made under the terms of the Apache 2.0 license.