fix(log results cache): include pipeline wrapper disabled in cache key (#13328)

ashwanthgoli · web-flow · commit 221491c123ad · 2024-07-08T11:16:57.000+05:30
diff --git a/pkg/querier/queryrange/log_result_cache.go b/pkg/querier/queryrange/log_result_cache.go
@@ -23,6 +23,7 @@ import (
 	"github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase"
 	"github.com/grafana/loki/v3/pkg/storage/chunk/cache"
 	"github.com/grafana/loki/v3/pkg/util/constants"
+	"github.com/grafana/loki/v3/pkg/util/httpreq"
 	"github.com/grafana/loki/v3/pkg/util/validation"
 )
 
@@ -124,6 +125,9 @@ func (l *logResultCache) Do(ctx context.Context, req queryrangebase.Request) (qu
 	}
 
 	cacheKey := fmt.Sprintf("log:%s:%s:%d:%d", tenant.JoinTenantIDs(transformedTenantIDs), req.GetQuery(), interval.Nanoseconds(), alignedStart.UnixNano()/(interval.Nanoseconds()))
+	if httpreq.ExtractHeader(ctx, httpreq.LokiDisablePipelineWrappersHeader) == "true" {
+		cacheKey = "pipeline-disabled:" + cacheKey
+	}
 
 	_, buff, _, err := l.cache.Fetch(ctx, []string{cache.HashKey(cacheKey)})
 	if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ import (`
`23`	`23`	`"github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase"`
`24`	`24`	`"github.com/grafana/loki/v3/pkg/storage/chunk/cache"`
`25`	`25`	`"github.com/grafana/loki/v3/pkg/util/constants"`
	`26`	`+ "github.com/grafana/loki/v3/pkg/util/httpreq"`
`26`	`27`	`"github.com/grafana/loki/v3/pkg/util/validation"`
`27`	`28`	`)`
`28`	`29`
`@@ -124,6 +125,9 @@ func (l *logResultCache) Do(ctx context.Context, req queryrangebase.Request) (qu`
`124`	`125`	`}`
`125`	`126`
`126`	`127`	`cacheKey := fmt.Sprintf("log:%s:%s:%d:%d", tenant.JoinTenantIDs(transformedTenantIDs), req.GetQuery(), interval.Nanoseconds(), alignedStart.UnixNano()/(interval.Nanoseconds()))`
	`128`	`+ if httpreq.ExtractHeader(ctx, httpreq.LokiDisablePipelineWrappersHeader) == "true" {`
	`129`	`+ cacheKey = "pipeline-disabled:" + cacheKey`
	`130`	`+ }`
`127`	`131`
`128`	`132`	`_, buff, _, err := l.cache.Fetch(ctx, []string{cache.HashKey(cacheKey)})`
`129`	`133`	`if err != nil {`