Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Relax External Endpoint Hedged Defaults #1566

Merged
merged 2 commits into from
Jul 12, 2022
Merged

Relax External Endpoint Hedged Defaults #1566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d2f23c
Change defaults
joe-elliott Jul 11, 2022
c91f41c
changelog
joe-elliott Jul 12, 2022
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
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,13 @@ Additionally, default label `span_status` is renamed to `status_code`.
* [CHANGE] Update to Go 1.18 [#1504](https://github.com/grafana/tempo/pull/1504) (@annanay25)
* [CHANGE] Change tag/value lookups to return partial results when reaching response size limit instead of failing [#1517](https://github.com/grafana/tempo/pull/1517) (@mdisibio)
* [CHANGE] Change search to be case-sensitive [#1547](https://github.com/grafana/tempo/issues/1547) (@mdisibio)
* [CHANGE] Relax Hedged request defaults for external endpoints. [#1566](https://github.com/grafana/tempo/pull/1566) (@joe-elliott)
```
querier:
search:
external_hedge_requests_at: 4s -> 8s
external_hedge_requests_up_to: 3 -> 2
```
* [FEATURE] metrics-generator: support per-tenant processor configuration [#1434](https://github.com/grafana/tempo/pull/1434) (@kvrhdn)
* [FEATURE] Include rollout dashboard [#1456](https://github.com/grafana/tempo/pull/1456) (@zalegrala)
* [FEATURE] Add SentinelPassword configuration for Redis [#1463](https://github.com/grafana/tempo/pull/1463) (@zalegrala)
Expand Down
4 changes: 2 additions & 2 deletions docs/tempo/website/configuration/_index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,11 +375,11 @@ querier:

# If set to a non-zero value a second request will be issued at the provided duration. Recommended to
# be set to p99 of external search requests to reduce long tail latency.
# (default: 4s)
# (default: 8s)
[external_hedge_requests_at: <duration>]

# The maximum number of requests to execute when hedging. Requires hedge_requests_at to be set.
# (default: 3)
# (default: 2)
[external_hedge_requests_up_to: <int>]

# config of the worker that connects to the query frontend
Expand Down
4 changes: 2 additions & 2 deletions docs/tempo/website/configuration/manifest.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,8 @@ querier:
query_timeout: 30s
prefer_self: 2
external_endpoints: []
external_hedge_requests_at: 4s
external_hedge_requests_up_to: 3
external_hedge_requests_at: 8s
external_hedge_requests_up_to: 2
query_timeout: 10s
max_concurrent_queries: 5
frontend_worker:
Expand Down
4 changes: 2 additions & 2 deletions docs/tempo/website/operations/backend_search.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@ querier:

# If set to a non-zero value a second request will be issued at the provided duration. Recommended to
# be set to p99 of search requests to reduce long tail latency.
external_hedge_requests_at: 5s
external_hedge_requests_at: 8s

# The maximum number of requests to execute when hedging. Requires hedge_requests_at to be set.
external_hedge_requests_up_to: 3
external_hedge_requests_up_to: 2
```

### Query frontend
Expand Down
4 changes: 2 additions & 2 deletions modules/querier/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ func (cfg *Config) RegisterFlagsAndApplyDefaults(prefix string, f *flag.FlagSet)
cfg.ExtraQueryDelay = 0
cfg.MaxConcurrentQueries = 5
cfg.Search.PreferSelf = 2
cfg.Search.HedgeRequestsAt = 4 * time.Second
cfg.Search.HedgeRequestsUpTo = 3
cfg.Search.HedgeRequestsAt = 8 * time.Second
cfg.Search.HedgeRequestsUpTo = 2
cfg.Search.QueryTimeout = 30 * time.Second
cfg.Worker = worker.Config{
MatchMaxConcurrency: true,
Expand Down