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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@

### 3.0 Cleanup

* [CHANGE] **BREAKING CHANGE** Remove partition ring livestore config [#6981](https://github.com/grafana/tempo/pull/6981) (@javiermolinar)
* [CHANGE] Flush blocks to backend storage from the Live store in single binary mode [#6941](https://github.com/grafana/tempo/pull/6941) (@javiermolinar)
* [CHANGE] **BREAKING CHANGE** Remove ingester module [#6959](https://github.com/grafana/tempo/pull/6959) (@javiermolinar)
* [CHANGE] Remove stale config from the examples [#6980](https://github.com/grafana/tempo/pull/6980) (@javiermolinar)
Expand Down
2 changes: 0 additions & 2 deletions cmd/tempo/app/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ type Config struct {
StreamOverHTTPEnabled bool `yaml:"stream_over_http_enabled,omitempty"`
HTTPAPIPrefix string `yaml:"http_api_prefix"`
EnableGoRuntimeMetrics bool `yaml:"enable_go_runtime_metrics,omitempty"`
Comment on lines 46 to 48
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Keep deprecated config key parseable

Removing partition_ring_live_store from app.Config makes upgrades fail fast for any existing config that still includes this key, because runtime config loading is strict (yaml.UnmarshalStrict in cmd/tempo/main.go:185). This key existed in all shipped example configs before this change, so users who only bump the binary (without rewriting config) will now get an unknown-field startup error. Please keep an ignored compatibility field (similar to other deprecated config shims) for at least one release or add a migration shim so old configs still boot.

Useful? React with 👍 / 👎.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No

PartitionRingLiveStore bool `yaml:"partition_ring_live_store,omitempty"` // todo: remove after rhythm migration

Memory MemoryConfig `yaml:"memory,omitempty"`
Comment on lines 46 to 50
Copy link

Copilot AI Apr 16, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

MEDIUM: The PR description still contains placeholders (eg Fixes #<issue number> and unchecked checklist items). Could this be updated so reviewers/users can understand the motivation and whether this is intended to be a breaking change?

Copilot uses AI. Check for mistakes.
Comment on lines 46 to 50
Copy link

Copilot AI Apr 16, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CRITICAL: Removing the partition_ring_live_store field from the root config will break upgrades for any users still setting it, because Tempo uses yaml.UnmarshalStrict for the config file (unknown fields cause startup failure). Could we keep this field as deprecated/ignored for at least one release (similar to MetricsGeneratorClient), or otherwise provide a compatibility path so existing configs continue to load?

Copilot uses AI. Check for mistakes.
Comment on lines 46 to 50
Copy link

Copilot AI Apr 16, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

MEDIUM: This is a user-visible config change (removal of partition_ring_live_store). It looks like there’s no corresponding entry in CHANGELOG.md under main / unreleased, which makes it easy for operators to miss during upgrades.

Copilot uses AI. Check for mistakes.
Server server.Config `yaml:"server,omitempty"`
Expand Down Expand Up @@ -81,7 +80,6 @@ func NewDefaultConfig() *Config {
func (c *Config) RegisterFlagsAndApplyDefaults(prefix string, f *flag.FlagSet) {
c.Target = SingleBinary
c.StreamOverHTTPEnabled = false
c.PartitionRingLiveStore = false

// Memory settings
c.Memory = MemoryConfig{
Expand Down
1 change: 0 additions & 1 deletion example/docker-compose/distributed/tempo.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
stream_over_http_enabled: true
partition_ring_live_store: true

server:
http_listen_port: 3200
Expand Down
2 changes: 0 additions & 2 deletions example/nomad/tempo-distributed/config.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
partition_ring_live_store: true

server:
log_level: info
http_listen_port: {{ env "NOMAD_PORT_http" }}
Expand Down
1 change: 0 additions & 1 deletion integration/util/config-base.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
#

stream_over_http_enabled: true
partition_ring_live_store: true

server:
http_listen_port: 3200
Expand Down
Loading