diff --git a/CHANGELOG.md b/CHANGELOG.md index 70cf7b27312..22b66fe3a6a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -50,7 +50,6 @@ * [ENHANCEMENT] Update to the latest dskit [#3915](https://github.com/grafana/tempo/pull/3915) (@andreasgerstmayr) * [ENHANCEMENT] Reduce allocs building queriers sharded requests [#3932](https://github.com/grafana/tempo/pull/3932) (@javiermolinar) * [ENHANCEMENT] Allow compaction disablement per-tenant [#3965](https://github.com/grafana/tempo/pull/3965) (@zalegrala) - * [ENHANCEMENT] Implement polling tenants concurrently [#3647](https://github.com/grafana/tempo/pull/3647) (@zalegrala) * [BUGFIX] Fix panic in certain metrics queries using `rate()` with `by` [#3847](https://github.com/grafana/tempo/pull/3847) (@stoewer) * [BUGFIX] Fix double appending the primary iterator on second pass with event iterator [#3903](https://github.com/grafana/tempo/pull/3903) (@ie-pham) @@ -69,6 +68,8 @@ * [BUGFIX] Bring back OTEL receiver metrics [#3917](https://github.com/grafana/tempo/pull/3917) (@javiermolinar) * [BUGFIX] Correct block end time when the ingested traces are outside the ingestion slack [#3954](https://github.com/grafana/tempo/pull/3954) (@javiermolinar) * [BUGFIX] Fix race condition where a streaming response could be marshalled while being modified in the combiner resulting in a panic. [#3961](https://github.com/grafana/tempo/pull/3961) (@joe-elliott) +* [BUGFIX] Pass search options to the backend for SearchTagValuesBlocksV2 requests [#3971](https://github.com/grafana/tempo/pull/3971) (@javiermolinar) + ## v2.5.0 diff --git a/modules/querier/querier.go b/modules/querier/querier.go index 702f0d003c0..a288acf6fea 100644 --- a/modules/querier/querier.go +++ b/modules/querier/querier.go @@ -1031,7 +1031,7 @@ func (q *Querier) internalTagValuesSearchBlockV2(ctx context.Context, req *tempo query := traceql.ExtractMatchers(req.SearchReq.Query) if traceql.IsEmptyQuery(query) { - return q.store.SearchTagValuesV2(ctx, meta, req.SearchReq, common.DefaultSearchOptions()) + return q.store.SearchTagValuesV2(ctx, meta, req.SearchReq, opts) } tag, err := traceql.ParseIdentifier(req.SearchReq.TagName) @@ -1040,7 +1040,7 @@ func (q *Querier) internalTagValuesSearchBlockV2(ctx context.Context, req *tempo } fetcher := traceql.NewTagValuesFetcherWrapper(func(ctx context.Context, req traceql.FetchTagValuesRequest, cb traceql.FetchTagValuesCallback) error { - return q.store.FetchTagValues(ctx, meta, req, cb, common.DefaultSearchOptions()) + return q.store.FetchTagValues(ctx, meta, req, cb, opts) }) valueCollector := collector.NewDistinctValue(q.limits.MaxBytesPerTagValuesQuery(tenantID), func(v tempopb.TagValue) int { return len(v.Type) + len(v.Value) })