Comment + lint

Signed-off-by: Alan Protasio <[email protected]>

Author: alanprot

pkg/querier/tripperware/instantquery/instant_query_test.go

@@ -25,13 +25,13 @@ func TestRequest(t *testing.T) {
 
 	for _, tc := range []struct {
 		url         string
-		expectedUrl string
+		expectedURL string
 		expected    tripperware.Request
 		expectedErr error
 	}{
 		{
 			url:         "/api/v1/query?query=sum%28container_memory_rss%29+by+%28namespace%29&stats=all&time=1536673680",
-			expectedUrl: "/api/v1/query?query=sum%28container_memory_rss%29+by+%28namespace%29&stats=all&time=1536673680",
+			expectedURL: "/api/v1/query?query=sum%28container_memory_rss%29+by+%28namespace%29&stats=all&time=1536673680",
 			expected: &PrometheusRequest{
 				Path:  "/api/v1/query",
 				Time:  1536673680 * 1e3,
@@ -44,7 +44,7 @@ func TestRequest(t *testing.T) {
 		},
 		{
 			url:         "/api/v1/query?query=sum%28container_memory_rss%29+by+%28namespace%29&time=1536673680",
-			expectedUrl: "/api/v1/query?query=sum%28container_memory_rss%29+by+%28namespace%29&time=1536673680",
+			expectedURL: "/api/v1/query?query=sum%28container_memory_rss%29+by+%28namespace%29&time=1536673680",
 			expected: &PrometheusRequest{
 				Path:  "/api/v1/query",
 				Time:  1536673680 * 1e3,
@@ -57,7 +57,7 @@ func TestRequest(t *testing.T) {
 		},
 		{
 			url:         "/api/v1/query?query=sum%28container_memory_rss%29+by+%28namespace%29",
-			expectedUrl: fmt.Sprintf("%s%d", "/api/v1/query?query=sum%28container_memory_rss%29+by+%28namespace%29&time=", now.Unix()),
+			expectedURL: fmt.Sprintf("%s%d", "/api/v1/query?query=sum%28container_memory_rss%29+by+%28namespace%29&time=", now.Unix()),
 			expected: &PrometheusRequest{
 				Path:  "/api/v1/query",
 				Time:  now.Unix() * 1e3,
@@ -88,7 +88,7 @@ func TestRequest(t *testing.T) {
 
 			rdash, err := codec.EncodeRequest(context.Background(), req)
 			require.NoError(t, err)
-			require.EqualValues(t, tc.expectedUrl, rdash.RequestURI)
+			require.EqualValues(t, tc.expectedURL, rdash.RequestURI)
 		})
 	}
 }

pkg/querier/tripperware/shard_by.go

@@ -22,7 +22,8 @@ func ShardByMiddleware(logger log.Logger, limits Limits, merger Merger) Middlewa
 			next:   next,
 			limits: limits,
 			merger: merger,
-			logger: logger}
+			logger: logger,
+		}
 	})
 }
 
@@ -50,7 +51,7 @@ func (s shardBy) Do(ctx context.Context, r Request) (Response, error) {
 	logger := util_log.WithContext(ctx, s.logger)
 	analysis, err := s.queryAnalyzer.Analyze(r.GetQuery())
 	if err != nil {
-		level.Warn(logger).Log("msg", "error sharding query", "q", r.GetQuery(), "err", err)
+		level.Warn(logger).Log("msg", "error analyzing query", "q", r.GetQuery(), "err", err)
 	}
 
 	if err != nil || !analysis.IsShardable() {
@@ -69,11 +70,7 @@ func (s shardBy) Do(ctx context.Context, r Request) (Response, error) {
 		resps = append(resps, reqResp.Response)
 	}
 
-	response, err := s.merger.MergeResponse(resps...)
-	if err != nil {
-		return nil, err
-	}
-	return response, nil
+	return s.merger.MergeResponse(resps...)
 }
 
 func (s shardBy) shardQuery(l log.Logger, numShards int, r Request, analysis querysharding.QueryAnalysis) []Request {