Skip to content
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.

Sign up for GitHub

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

Backport of command/debug: fix bug where monitor was not honoring configured duration into release/1.11.x #16852

Merged
merged 2 commits into from
Aug 24, 2022
Merged

Backport of command/debug: fix bug where monitor was not honoring configured duration into release/1.11.x #16852

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c6b771f
backport of commit a222dbfd2954bf2f41e27fb96f4d9be2347504f7
davidadeleon Aug 23, 2022
5ecf35d
Merge branch 'release/1.11.x' into backport/davidadeleon/fix-debug-mo…
davidadeleon Aug 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions changelog/16834.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
command/debug: fix bug where monitor was not honoring configured duration
```
13 changes: 12 additions & 1 deletion command/debug.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1071,7 +1071,18 @@ func (c *DebugCommand) writeLogs(ctx context.Context) {
}
defer out.Close()

logCh, err := c.cachedClient.Sys().Monitor(ctx, "trace", c.logFormat)
// Create Monitor specific client based on the cached client
mClient, err := c.cachedClient.Clone()
if err != nil {
c.captureError("log", err)
return
}
mClient.SetToken(c.cachedClient.Token())

// Set timeout to match the context explicitly
mClient.SetClientTimeout(c.flagDuration + debugDurationGrace)

logCh, err := mClient.Sys().Monitor(ctx, "trace", c.logFormat)
if err != nil {
c.captureError("log", err)
return
Expand Down