backport of commit a222dbf (#16852)

Co-authored-by: davidadeleon <[email protected]>
hashicorp · Aug 24, 2022 · c10ccf1 · c10ccf1
1 parent 20d1660
commit c10ccf1
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/changelog/16834.txt b/changelog/16834.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+command/debug: fix bug where monitor was not honoring configured duration
+```
diff --git a/command/debug.go b/command/debug.go
@@ -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