Skip to content

Commit

Permalink
fix: pass search options to the backend (#3971)
Browse files Browse the repository at this point in the history
* use search options

* changelog
  • Loading branch information
javiermolinar authored Aug 16, 2024
1 parent 3e20eb2 commit 3e4019f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,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

Expand Down
4 changes: 2 additions & 2 deletions modules/querier/querier.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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) })
Expand Down

0 comments on commit 3e4019f

Please sign in to comment.