Skip to content

Improve error message when overrides fail to parse #5787

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

Merged
mapno merged 3 commits into from
Oct 23, 2025
Merged

Improve error message when overrides fail to parse #5787

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1f636c0
Improve error message when overrides fail to parse
mapno Oct 23, 2025
00e59a1
chlog
mapno Oct 23, 2025
871d518
better
mapno Oct 23, 2025
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
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
* [ENHANCEMENT] Unsafe search hints for frontend performance tests [#5723](https://github.com/grafana/tempo/pull/5723) (@ruslan-mikhailov)
* [ENHANCEMENT] Add new livestore alert to the tempo-mixin [#5752](https://github.com/grafana/tempo/pull/5752) (@javiermolinar)
* [ENHANCEMENT] Improve shutdown time in the first 30 seconds [#5725](https://github.com/grafana/tempo/pull/5725) (@ldufr)
* [ENHANCEMENT] Add metric for tracking added latency to write requests [#](https://github.com/grafana/tempo/pull/) (@mapno)
* [ENHANCEMENT] Add metric for tracking added latency to write requests [#5781](https://github.com/grafana/tempo/pull/5781) (@mapno)
* [ENHANCEMENT] Improve error message when overrides fail to parse [#5787](https://github.com/grafana/tempo/pull/5787) (@mapno)
* [BUGFIX] Fix compactor to properly consider SSE-KMS information during metadata copy [#5774](https://github.com/grafana/tempo/pull/5774) (@steffsas)
* [BUGFIX] Correctly track and reject too large traces in live stores. [#5757](https://github.com/grafana/tempo/pull/5757) (@joe-elliott)
* [BUGFIX] Fix issues related to integer dedicated columns in vParquet5-preview2 [#5716](https://github.com/grafana/tempo/pull/5716) (@stoewer)
Expand Down
4 changes: 2 additions & 2 deletions modules/overrides/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,8 +249,8 @@ func (c *Config) UnmarshalYAML(unmarshal func(interface{}) error) error {
legacyCfg.PerTenantOverridePeriod = c.PerTenantOverridePeriod
legacyCfg.UserConfigurableOverridesConfig = c.UserConfigurableOverridesConfig

if err := unmarshal(&legacyCfg); err != nil {
return err
if legacyErr := unmarshal(&legacyCfg); legacyErr != nil {
return fmt.Errorf("failed to unmarshal config: %w; also failed in legacy format: %w", err, legacyErr)
}

c.Defaults = legacyCfg.DefaultOverrides.toNewLimits()
Expand Down
Loading