refactoring, addressing comments

Author: pranavmishradatabricks

internal/cortex/frontend/transport/handler.go

@@ -69,23 +69,20 @@ type Handler struct {
 // NewHandler creates a new frontend handler.
 func NewHandler(cfg HandlerConfig, roundTripper http.RoundTripper, log log.Logger, reg prometheus.Registerer) http.Handler {
 	var (
-		FailedQueryCache *utils.FailedQueryCache
-		errQueryCache    error
+		h = &Handler{}
 	)
 
 	if cfg.FailedQueryCacheCapacity > 0 {
-		FailedQueryCache, errQueryCache = utils.NewFailedQueryCache(cfg.FailedQueryCacheCapacity)
+		FailedQueryCache, errQueryCache := utils.NewFailedQueryCache(cfg.FailedQueryCacheCapacity)
 		if errQueryCache != nil {
 			level.Warn(log).Log(errQueryCache.Error())
 		}
+		h.failedQueryCache = FailedQueryCache
 	}
 
-	h := &Handler{
-		cfg:              cfg,
-		log:              log,
-		roundTripper:     roundTripper,
-		failedQueryCache: FailedQueryCache,
-	}
+	h.cfg = cfg
+	h.log = log
+	h.roundTripper = roundTripper
 
 	if cfg.QueryStatsEnabled {
 		h.querySeconds = promauto.With(reg).NewCounterVec(prometheus.CounterOpts{
@@ -149,7 +146,7 @@ func (f *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 
 	// Check if query is cached
 	if f.failedQueryCache != nil {
-		cached, message := f.failedQueryCache.CallQueryHitCache(urlQuery)
+		cached, message := f.failedQueryCache.QueryHitCache(urlQuery)
 		if cached {
 			w.WriteHeader(http.StatusForbidden)
 			level.Info(util_log.WithContext(r.Context(), f.log)).Log(message)
@@ -168,7 +165,7 @@ func (f *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 
 		// Update cache for failed queries.
 		if f.failedQueryCache != nil {
-			success, message := f.failedQueryCache.CallUpdateFailedQueryCache(err, urlQuery)
+			success, message := f.failedQueryCache.UpdateFailedQueryCache(err, urlQuery)
 			if success {
 				level.Info(util_log.WithContext(r.Context(), f.log)).Log(message)
 			} else {

internal/cortex/frontend/transport/utils/utils.go

@@ -143,14 +143,14 @@ func (f *FailedQueryCache) normalizeQueryString(query url.Values) string {
 	return f.regex.ReplaceAllString(query.Get("query"), " ")
 }
 
-func (f *FailedQueryCache) CallUpdateFailedQueryCache(err error, query url.Values) (bool, string) {
+func (f *FailedQueryCache) UpdateFailedQueryCache(err error, query url.Values) (bool, string) {
 	queryExpressionNormalized := f.normalizeQueryString(query)
 	queryExpressionRangeLength := getQueryRangeSeconds(query)
 	success, message := f.updateFailedQueryCache(err, queryExpressionNormalized, queryExpressionRangeLength, f.lruCache)
 	return success, message
 }
 
-func (f *FailedQueryCache) CallQueryHitCache(query url.Values) (bool, string) {
+func (f *FailedQueryCache) QueryHitCache(query url.Values) (bool, string) {
 	queryExpressionNormalized := f.normalizeQueryString(query)
 	queryExpressionRangeLength := getQueryRangeSeconds(query)
 	cached, message := queryHitCache(queryExpressionNormalized, queryExpressionRangeLength, f.lruCache)

internal/cortex/frontend/transport/utils/utils_test.go

@@ -103,7 +103,7 @@ func TestUpdateFailedQueryCache(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			result, message := cache.CallUpdateFailedQueryCache(tt.err, tt.query)
+			result, message := cache.UpdateFailedQueryCache(tt.err, tt.query)
 			if result != tt.expectedResult {
 				t.Errorf("expected result %v, got %v", tt.expectedResult, result)
 			}
@@ -185,7 +185,7 @@ func TestQueryHitCache(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			result, message := cache.CallQueryHitCache(tt.query)
+			result, message := cache.QueryHitCache(tt.query)
 			if result != tt.expectedResult {
 				t.Errorf("expected result %v, got %v", tt.expectedResult, result)
 			}