logcli: Refactor logcli Client interface to use time.Time and time.Du…

…ration for LiveTailQueryConn method (#3271)
grafana · Feb 2, 2021 · 054b8fc · 054b8fc
1 parent 4d1c6e0
commit 054b8fc
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 12 deletions.
diff --git a/cmd/logcli/main.go b/cmd/logcli/main.go
@@ -156,7 +156,7 @@ func main() {
 		}
 
 		if *tail {
-			rangeQuery.TailQuery(*delayFor, queryClient, out)
+			rangeQuery.TailQuery(time.Duration(*delayFor)*time.Second, queryClient, out)
 		} else {
 			rangeQuery.DoQuery(queryClient, out, *statistics)
 		}

diff --git a/pkg/logcli/client/client.go b/pkg/logcli/client/client.go
@@ -41,7 +41,7 @@ type Client interface {
 	ListLabelNames(quiet bool, start, end time.Time) (*loghttp.LabelResponse, error)
 	ListLabelValues(name string, quiet bool, start, end time.Time) (*loghttp.LabelResponse, error)
 	Series(matchers []string, start, end time.Time, quiet bool) (*loghttp.SeriesResponse, error)
-	LiveTailQueryConn(queryStr string, delayFor int, limit int, start int64, quiet bool) (*websocket.Conn, error)
+	LiveTailQueryConn(queryStr string, delayFor time.Duration, limit int, start time.Time, quiet bool) (*websocket.Conn, error)
 	GetOrgID() string
 }
 
@@ -131,14 +131,16 @@ func (c *DefaultClient) Series(matchers []string, start, end time.Time, quiet bo
 }
 
 // LiveTailQueryConn uses /api/prom/tail to set up a websocket connection and returns it
-func (c *DefaultClient) LiveTailQueryConn(queryStr string, delayFor int, limit int, start int64, quiet bool) (*websocket.Conn, error) {
-	qsb := util.NewQueryStringBuilder()
-	qsb.SetString("query", queryStr)
-	qsb.SetInt("delay_for", int64(delayFor))
-	qsb.SetInt("limit", int64(limit))
-	qsb.SetInt("start", start)
+func (c *DefaultClient) LiveTailQueryConn(queryStr string, delayFor time.Duration, limit int, start time.Time, quiet bool) (*websocket.Conn, error) {
+	params := util.NewQueryStringBuilder()
+	params.SetString("query", queryStr)
+	if delayFor != 0 {
+		params.SetInt("delay_for", int64(delayFor.Seconds()))
+	}
+	params.SetInt("limit", int64(limit))
+	params.SetInt("start", start.UnixNano())
 
-	return c.wsConnect(tailPath, qsb.Encode(), quiet)
+	return c.wsConnect(tailPath, params.Encode(), quiet)
 }
 
 func (c *DefaultClient) GetOrgID() string {

diff --git a/pkg/logcli/query/query_test.go b/pkg/logcli/query/query_test.go
@@ -551,7 +551,7 @@ func (t *testQueryClient) Series(matchers []string, from, through time.Time, qui
 	panic("implement me")
 }
 
-func (t *testQueryClient) LiveTailQueryConn(queryStr string, delayFor int, limit int, from int64, quiet bool) (*websocket.Conn, error) {
+func (t *testQueryClient) LiveTailQueryConn(queryStr string, delayFor time.Duration, limit int, start time.Time, quiet bool) (*websocket.Conn, error) {
 	panic("implement me")
 }
 

diff --git a/pkg/logcli/query/tail.go b/pkg/logcli/query/tail.go
@@ -6,6 +6,7 @@ import (
 	"os/signal"
 	"strings"
 	"syscall"
+	"time"
 
 	"github.com/fatih/color"
 	"github.com/gorilla/websocket"
@@ -17,8 +18,8 @@ import (
 )
 
 // TailQuery connects to the Loki websocket endpoint and tails logs
-func (q *Query) TailQuery(delayFor int, c client.Client, out output.LogOutput) {
-	conn, err := c.LiveTailQueryConn(q.QueryString, delayFor, q.Limit, q.Start.UnixNano(), q.Quiet)
+func (q *Query) TailQuery(delayFor time.Duration, c client.Client, out output.LogOutput) {
+	conn, err := c.LiveTailQueryConn(q.QueryString, delayFor, q.Limit, q.Start, q.Quiet)
 	if err != nil {
 		log.Fatalf("Tailing logs failed: %+v", err)
 	}