fix tests

Signed-off-by: Justin Jung <[email protected]>

Author: justinjung04

pkg/frontend/transport/handler.go

@@ -490,37 +490,39 @@ func (f *Handler) reportQueryStats(r *http.Request, source, userID string, query
 		}
 	}
 
-	// We are unable to use errors.As to compare since body string from the http response is wrapped as an error
 	var reason string
-	errMsg := error.Error()
-	if statusCode == http.StatusTooManyRequests {
-		var resourceExhaustedErr resource.ExhaustedError
-		if strings.Contains(errMsg, resourceExhaustedErr.Error()) {
-			reason = reasonResourceExhausted
-		} else {
-			reason = reasonTooManyRequests
-		}
-	} else if statusCode == http.StatusRequestEntityTooLarge {
+	if statusCode == http.StatusRequestEntityTooLarge {
 		reason = reasonResponseBodySizeExceeded
-	} else if statusCode == http.StatusUnprocessableEntity {
-		if strings.Contains(errMsg, limitTooManySamples) {
-			reason = reasonTooManySamples
-		} else if strings.Contains(errMsg, limitTimeRangeExceeded) {
-			reason = reasonTimeRangeExceeded
-		} else if strings.Contains(errMsg, limitSeriesFetched) {
-			reason = reasonSeriesFetched
-		} else if strings.Contains(errMsg, limitChunksFetched) {
-			reason = reasonChunksFetched
-		} else if strings.Contains(errMsg, limitChunkBytesFetched) {
-			reason = reasonChunkBytesFetched
-		} else if strings.Contains(errMsg, limitDataBytesFetched) {
-			reason = reasonDataBytesFetched
-		} else if strings.Contains(errMsg, limitSeriesStoreGateway) {
-			reason = reasonSeriesLimitStoreGateway
-		} else if strings.Contains(errMsg, limitChunksStoreGateway) {
-			reason = reasonChunksLimitStoreGateway
-		} else if strings.Contains(errMsg, limitBytesStoreGateway) {
-			reason = reasonBytesLimitStoreGateway
+	} else if error != nil {
+		// We are unable to use errors.As to compare since body string from the http response is wrapped as an error
+		errMsg := error.Error()
+		if statusCode == http.StatusTooManyRequests {
+			var resourceExhaustedErr resource.ExhaustedError
+			if strings.Contains(errMsg, resourceExhaustedErr.Error()) {
+				reason = reasonResourceExhausted
+			} else {
+				reason = reasonTooManyRequests
+			}
+		} else if statusCode == http.StatusUnprocessableEntity {
+			if strings.Contains(errMsg, limitTooManySamples) {
+				reason = reasonTooManySamples
+			} else if strings.Contains(errMsg, limitTimeRangeExceeded) {
+				reason = reasonTimeRangeExceeded
+			} else if strings.Contains(errMsg, limitSeriesFetched) {
+				reason = reasonSeriesFetched
+			} else if strings.Contains(errMsg, limitChunksFetched) {
+				reason = reasonChunksFetched
+			} else if strings.Contains(errMsg, limitChunkBytesFetched) {
+				reason = reasonChunkBytesFetched
+			} else if strings.Contains(errMsg, limitDataBytesFetched) {
+				reason = reasonDataBytesFetched
+			} else if strings.Contains(errMsg, limitSeriesStoreGateway) {
+				reason = reasonSeriesLimitStoreGateway
+			} else if strings.Contains(errMsg, limitChunksStoreGateway) {
+				reason = reasonChunksLimitStoreGateway
+			} else if strings.Contains(errMsg, limitBytesStoreGateway) {
+				reason = reasonBytesLimitStoreGateway
+			}
 		}
 	}
 	if len(reason) > 0 {

pkg/util/resource/monitor_test.go

@@ -2,7 +2,6 @@ package resource
 
 import (
 	"context"
-	"fmt"
 	"testing"
 	"time"
 
@@ -71,27 +70,6 @@ func TestMonitor(t *testing.T) {
 	}
 }
 
-func TestMonitor_GetCPUUtilization(t *testing.T) {
-	limits := configs.Resources{CPU: 10}
-	thresholds := configs.Resources{}
-	scanner := mockScanner{CPU: 0}
-
-	monitor, err := NewMonitor(thresholds, limits, &scanner, nil)
-	require.NoError(t, err)
-	require.NoError(t, monitor.StartAsync(context.Background()))
-	t.Cleanup(func() {
-		require.NoError(t, services.StopAndAwaitTerminated(context.Background(), monitor))
-	})
-
-	for i := 0; i < 10; i++ {
-		scanner.CPU++
-		time.Sleep(time.Second) // let scanner store values
-	}
-
-	fmt.Println(monitor.GetCPUUtilization())
-	require.InDelta(t, 0.1, monitor.GetCPUUtilization(), 1e-5)
-}
-
 type mockScanner struct {
 	CPU  float64
 	Heap uint64