updated deps, changed log formatting

Author: pranavmishradatabricks

go.mod

@@ -36,7 +36,7 @@ require (
 	github.com/grpc-ecosystem/go-grpc-middleware/providers/kit/v2 v2.0.0-20201002093600-73cf2ae9d891
 	github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.0-rc.2.0.20201207153454-9f6bf00c00a7
 	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
-	github.com/hashicorp/golang-lru v0.6.0
+	github.com/hashicorp/golang-lru/v2 v2.0.7
 	github.com/jpillora/backoff v1.0.0
 	github.com/json-iterator/go v1.1.12
 	github.com/klauspost/compress v1.17.7

go.sum

@@ -1153,6 +1153,7 @@ github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.6.0 h1:uL2shRDx7RTrOrTCUZEGP/wJUFiUI8QT6E7z5o8jga4=
 github.com/hashicorp/golang-lru v0.6.0/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
+github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
 github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64=
 github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ=
 github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I=

internal/cortex/frontend/transport/handler.go

@@ -81,7 +81,7 @@ func NewHandler(cfg HandlerConfig, roundTripper http.RoundTripper, log log.Logge
 		LruCache, err = lru.New(cfg.FailedQueryCacheCapacity)
 		if err != nil {
 			LruCache = nil
-			level.Error(log).Log("msg", "Failed to create LruCache", "err", err)
+			level.Warn(log).Log("msg", "Failed to create LruCache", "error", err)
 		}
 	}
 
@@ -142,7 +142,6 @@ func (f *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		var ctx context.Context
 		stats, ctx = querier_stats.ContextWithEmptyStats(r.Context())
 		r = r.WithContext(ctx)
-		level.Info(util_log.WithContext(r.Context(), f.log)).Log("msg", "Query Stats Enabled")
 	}
 
 	defer func() {
@@ -165,7 +164,11 @@ func (f *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		// Check if query in cache and whether value exceeds time range length.
 		if value, ok := f.lruCache.Get(queryExpressionNormalized); ok && value.(int) >= queryExpressionRangeLength {
 			w.WriteHeader(http.StatusForbidden)
-			level.Warn(util_log.WithContext(r.Context(), f.log)).Log("msg", "Retrieved query from cache", "Query expression", queryExpressionNormalized)
+			level.Info(util_log.WithContext(r.Context(), f.log)).Log(
+				"msg", "Retrieved query from cache",
+				"normalized_query", queryExpressionNormalized,
+				"range_seconds", queryExpressionRangeLength,
+			)
 			f.cachedHits.Inc()
 			return
 		}
@@ -227,7 +230,10 @@ func (f *Handler) updateFailedQueryCache(err error, queryExpressionNormalized st
 	// Checking if error code extracted successfully.
 	if codeExtract == nil || len(codeExtract) < 2 {
 		level.Error(util_log.WithContext(r.Context(), f.log)).Log(
-			"msg", "Error string regex conversion error")
+			"msg", "Error string regex conversion error",
+			"normalized_query", queryExpressionNormalized,
+			"range_seconds", queryExpressionRangeLength,
+			"error", err)
 		return
 	}
 
@@ -237,14 +243,21 @@ func (f *Handler) updateFailedQueryCache(err error, queryExpressionNormalized st
 	// Checking if error code extracted properly from string.
 	if strConvError != nil {
 		level.Error(util_log.WithContext(r.Context(), f.log)).Log(
-			"msg", "String to int conversion error")
+			"msg", "String to int conversion error",
+			"normalized_query", queryExpressionNormalized,
+			"range_seconds", queryExpressionRangeLength,
+			"error", err)
 		return
 	}
 
 	// If error should be cached, store it in cache.
 	if !isCacheableError(errCode) {
 		level.Debug(util_log.WithContext(r.Context(), f.log)).Log(
-			"msg", "Query not cached due to non-cacheable error code")
+			"msg", "Query not cached due to non-cacheable error code",
+			"normalized_query", queryExpressionNormalized,
+			"range_seconds", queryExpressionRangeLength,
+			"error", err,
+		)
 		return
 	}
 
@@ -257,7 +270,12 @@ func (f *Handler) updateFailedQueryCache(err error, queryExpressionNormalized st
 	}
 
 	level.Debug(util_log.WithContext(r.Context(), f.log)).Log(
-		"msg", "Query cached", "response ")
+		"msg", "Cached a failed query",
+		"normalized_query", queryExpressionNormalized,
+		"range_seconds", queryExpressionRangeLength,
+		"error", err,
+	)
+
 }
 
 // isCacheableError Returns true if response code is in pre-defined cacheable errors list, else returns false.