Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## main / unreleased

* [CHANGE] Set default `max_result_limit` for search to 256*1024 [#6525](https://github.com/grafana/tempo/pull/6525) (@zhxiaogg)

# v2.10.1

* [CHANGE] Upgrade Tempo to Go 1.25.7 [#6449](https://github.com/grafana/tempo/pull/6449) (@zalegrala)
Expand Down
2 changes: 1 addition & 1 deletion docs/sources/tempo/configuration/manifest.md
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,7 @@ query_frontend:
concurrent_jobs: 1000
target_bytes_per_job: 104857600
default_result_limit: 20
max_result_limit: 0
max_result_limit: 262144
max_duration: 168h0m0s
query_backend_after: 15m0s
query_ingesters_until: 30m0s
Expand Down
2 changes: 1 addition & 1 deletion modules/frontend/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ func (cfg *Config) RegisterFlagsAndApplyDefaults(string, *flag.FlagSet) {
QueryBackendAfter: 15 * time.Minute,
QueryIngestersUntil: 30 * time.Minute,
DefaultLimit: 20,
MaxLimit: 0,
MaxLimit: 256 * 1024,
MaxDuration: 168 * time.Hour, // 1 week
ConcurrentRequests: defaultConcurrentRequests,
TargetBytesPerRequest: defaultTargetBytesPerRequest,
Expand Down
15 changes: 15 additions & 0 deletions modules/frontend/config_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package frontend

import (
"flag"
"testing"

"github.com/stretchr/testify/assert"
)

func TestSearchSharderConfigDefaults(t *testing.T) {
cfg := &Config{}
cfg.RegisterFlagsAndApplyDefaults("", &flag.FlagSet{})

assert.Equal(t, uint32(256*1024), cfg.Search.Sharder.MaxLimit)
}
Loading