From bb2a7f43385fe469e587348ebdb31ea0b15674ed Mon Sep 17 00:00:00 2001
From: Drew Bailey <2614075+drewbailey@users.noreply.github.com>
Date: Mon, 4 Nov 2019 14:17:15 -0500
Subject: [PATCH] address feedback, fix gauge metric name

---
 api/agent.go             | 1 +
 client/agent_endpoint.go | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/api/agent.go b/api/agent.go
index 2ec8ff233..d372b8062 100644
--- a/api/agent.go
+++ b/api/agent.go
@@ -263,6 +263,7 @@ func (a *Agent) Monitor(stopCh <-chan struct{}, q *QueryOptions) (<-chan *Stream
 		for {
 			select {
 			case <-stopCh:
+				close(frames)
 				return
 			default:
 			}
diff --git a/client/agent_endpoint.go b/client/agent_endpoint.go
index a95a5345d..c6c441d75 100644
--- a/client/agent_endpoint.go
+++ b/client/agent_endpoint.go
@@ -30,7 +30,7 @@ func NewAgentEndpoint(c *Client) *Agent {
 }
 
 func (m *Agent) monitor(conn io.ReadWriteCloser) {
-	defer metrics.MeasureSince([]string{"client", "monitor", "monitor"}, time.Now())
+	defer metrics.MeasureSince([]string{"client", "agent", "monitor"}, time.Now())
 	defer conn.Close()
 
 	// Decode arguments