chore: remove deprecated query_live_store config#7048
chore: remove deprecated query_live_store config#7048javiermolinar merged 3 commits intografana:mainfrom
Conversation
javiermolinar
requested review from
carles-grafana,
electron0zero,
ie-pham,
mapno,
mattdurham,
mdisibio,
oleg-kozlyuk-grafana,
ruslan-mikhailov,
stoewer,
yvrhdn and
zalegrala
as code owners
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 027d16b2f6
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
| SecondaryIngesterRing string `yaml:"secondary_ingester_ring,omitempty"` | ||
| // Deprecated: kept only for config compatibility. Querier always uses | ||
| // partition-ring query path when available. | ||
| QueryLiveStore bool `yaml:"query_live_store,omitempty"` | ||
| } |
There was a problem hiding this comment.
Removing query_live_store from querier.Config turns a previously tolerated key into a hard startup failure for upgraded clusters that still carry it in their config files. Tempo parses config with yaml.UnmarshalStrict (cmd/tempo/main.go:185), so this deletion makes query_live_store an unknown field and causes tempo (and -config.verify) to fail before boot; this is an immediate upgrade break for existing deployments, not just an example cleanup.
Useful? React with 👍 / 👎.
There was a problem hiding this comment.
Pull request overview
Removes the deprecated querier.query_live_store configuration option from Tempo’s querier config and updates bundled example/integration configs accordingly.
Changes:
- Drop
QueryLiveStorefrommodules/querier.Configand its defaulting. - Remove
query_live_store: truefrom integration and example YAML configs. - Add a changelog entry describing the removal.
Reviewed changes
Copilot reviewed 6 out of 6 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| modules/querier/config.go | Removes deprecated QueryLiveStore field and default assignment. |
| integration/util/config-base.yaml | Removes querier.query_live_store from base integration config. |
| integration/operations/config-https.yaml | Removes querier.query_live_store from HTTPS integration config. |
| example/nomad/tempo-distributed/config.yml | Removes deprecated querier setting from Nomad example config. |
| example/docker-compose/distributed/tempo.yaml | Removes deprecated querier setting from docker-compose example config. |
| CHANGELOG.md | Adds an entry documenting the config removal. |
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
There was a problem hiding this comment.
Pull request overview
Removes the deprecated querier.query_live_store configuration option from Tempo’s querier module, and updates bundled configs/examples accordingly so upgrades don’t carry a no-longer-supported field.
Changes:
- Remove
QueryLiveStorefrommodules/querierconfig struct and its defaulting logic. - Remove
query_live_store: truefrom integration configs and example deployment configs. - Add a
CHANGELOG.mdentry marking the removal as a breaking change.
Reviewed changes
Copilot reviewed 6 out of 6 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
modules/querier/config.go |
Drops the deprecated QueryLiveStore config field and its default assignment. |
integration/util/config-base.yaml |
Removes the deprecated config field from the base e2e config. |
integration/operations/config-https.yaml |
Removes the deprecated config field from the HTTPS integration config. |
example/nomad/tempo-distributed/config.yml |
Removes the deprecated config field from the Nomad example. |
example/docker-compose/distributed/tempo.yaml |
Removes the deprecated config field from the docker-compose example. |
CHANGELOG.md |
Documents the breaking removal for upgrade visibility. |
* chore: remove deprecated query_live_store config * docs(changelog): add entry for grafana#7048 * Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
What this PR does:
Which issue(s) this PR fixes:
Fixes #
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]