lint n' stuff

Signed-off-by: Joe Elliott <number101010@gmail.com>
grafana · May 24, 2024 · d1dc786 · d1dc786
1 parent 343fc7a
commit d1dc786
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 16 deletions.
diff --git a/modules/frontend/combiner/common_test.go b/modules/frontend/combiner/common_test.go
@@ -124,15 +124,13 @@ func TestGenericCombinerDoesntRace(t *testing.T) {
 		}
 	}
 	go concurrent(func() {
-		err := combiner.AddResponse(newTestResponse(t))
-		require.NoError(t, err)
+		_ = combiner.AddResponse(newTestResponse(t))
 	})
 
 	go concurrent(func() {
 		// this test is going to add a failed response which cuts off certain code paths. just wait a bit to test the other paths
 		time.Sleep(10 * time.Millisecond)
-		err := combiner.AddResponse(newFailedTestResponse())
-		require.NoError(t, err)
+		_ = combiner.AddResponse(newFailedTestResponse())
 	})
 
 	go concurrent(func() {
@@ -144,18 +142,15 @@ func TestGenericCombinerDoesntRace(t *testing.T) {
 	})
 
 	go concurrent(func() {
-		_, err := combiner.HTTPFinal()
-		require.NoError(t, err)
+		_, _ = combiner.HTTPFinal()
 	})
 
 	go concurrent(func() {
-		_, err := combiner.GRPCFinal()
-		require.NoError(t, err)
+		_, _ = combiner.GRPCFinal()
 	})
 
 	go concurrent(func() {
-		_, err := combiner.GRPCDiff()
-		require.NoError(t, err)
+		_, _ = combiner.GRPCDiff()
 	})
 
 	time.Sleep(100 * time.Millisecond)

diff --git a/modules/frontend/pipeline/collector_grpc.go b/modules/frontend/pipeline/collector_grpc.go
@@ -41,7 +41,7 @@ func (c GRPCCollector[T]) RoundTrip(req *http.Request) error {
 
 	lastUpdate := time.Now()
 
-	err = addNextAsync(ctx, c.consumers, resps, c.next, c.combiner, func() error {
+	err = addNextAsync(ctx, c.consumers, resps, c.combiner, func() error {
 		// check if we should send an update
 		if time.Since(lastUpdate) > 500*time.Millisecond {
 			lastUpdate = time.Now()

diff --git a/modules/frontend/pipeline/collector_http.go b/modules/frontend/pipeline/collector_http.go
@@ -39,15 +39,15 @@ func (r httpCollector) RoundTrip(req *http.Request) (*http.Response, error) {
 		return nil, err
 	}
 
-	err = addNextAsync(ctx, r.consumers, resps, r.next, r.combiner, nil)
+	err = addNextAsync(ctx, r.consumers, resps, r.combiner, nil)
 	if err != nil {
 		return nil, err
 	}
 
 	return r.combiner.HTTPFinal()
 }
 
-func addNextAsync(ctx context.Context, consumers int, resps Responses[combiner.PipelineResponse], next AsyncRoundTripper[combiner.PipelineResponse], c combiner.Combiner, callback func() error) error {
+func addNextAsync(ctx context.Context, consumers int, resps Responses[combiner.PipelineResponse], c combiner.Combiner, callback func() error) error {
 	respChan := make(chan combiner.PipelineResponse)
 	overallErr := atomic.Error{}
 	wg := sync.WaitGroup{}

diff --git a/modules/frontend/pipeline/responses_test.go b/modules/frontend/pipeline/responses_test.go
@@ -326,7 +326,7 @@ func TestAsyncResponsesDoesNotLeak(t *testing.T) {
 				bridge := &pipelineBridge{
 					next: tc.finalRT(cancel),
 				}
-				grpcCollector := NewGRPCCollector[*tempopb.SearchResponse](sharder{next: bridge}, 0, combiner.NewTypedSearch(0), func(sr *tempopb.SearchResponse) error { return nil })
+				grpcCollector := NewGRPCCollector[*tempopb.SearchResponse](sharder{next: bridge}, 0, combiner.NewTypedSearch(0), func(_ *tempopb.SearchResponse) error { return nil })
 
 				_ = grpcCollector.RoundTrip(req)
 
@@ -350,7 +350,7 @@ func TestAsyncResponsesDoesNotLeak(t *testing.T) {
 				}
 
 				s := sharder{next: sharder{next: bridge}, funcSharder: true}
-				grpcCollector := NewGRPCCollector[*tempopb.SearchResponse](s, 0, combiner.NewTypedSearch(0), func(sr *tempopb.SearchResponse) error { return nil })
+				grpcCollector := NewGRPCCollector[*tempopb.SearchResponse](s, 0, combiner.NewTypedSearch(0), func(_ *tempopb.SearchResponse) error { return nil })
 
 				_ = grpcCollector.RoundTrip(req)
 
@@ -373,7 +373,7 @@ func TestAsyncResponsesDoesNotLeak(t *testing.T) {
 				}
 
 				s := sharder{next: sharder{next: bridge, funcSharder: true}}
-				grpcCollector := NewGRPCCollector[*tempopb.SearchResponse](s, 0, combiner.NewTypedSearch(0), func(sr *tempopb.SearchResponse) error { return nil })
+				grpcCollector := NewGRPCCollector[*tempopb.SearchResponse](s, 0, combiner.NewTypedSearch(0), func(_ *tempopb.SearchResponse) error { return nil })
 
 				_ = grpcCollector.RoundTrip(req)