Update live store to honor local and global block configs#6509
Merged
mdisibio merged 5 commits intografana:mainfrom Feb 19, 2026
Merged
Update live store to honor local and global block configs#6509mdisibio merged 5 commits intografana:mainfrom
mdisibio merged 5 commits intografana:mainfrom
Conversation
mdisibio
requested review from
carles-grafana,
electron0zero,
ie-pham,
javiermolinar,
mapno,
mattdurham,
oleg-kozlyuk-grafana,
ruslan-mikhailov,
stoewer,
yvrhdn and
zalegrala
as code owners
mapno
approved these changes
Feb 19, 2026
Harry-kp
added a commit
to Harry-kp/tempo
that referenced
this pull request
Feb 21, 2026
…d WAL versions The block builder was hardcoding the default encoding version in BlockConfig.RegisterFlagsAndApplyDefaults, ignoring the global storage.trace.block.version config. This replicates the approach from grafana#6509 (live store fix): introduce a GlobalBlockConfig field injected by the application, and a coalesceBlockVersion function that resolves the encoding with proper fallback (default -> global -> local block_config). Fixes grafana#6451
3 tasks
javiermolinar
pushed a commit
that referenced
this pull request
Feb 24, 2026
…d WAL versions (#6532) * fix: block builder honor the global storage block config for block and WAL versions The block builder was hardcoding the default encoding version in BlockConfig.RegisterFlagsAndApplyDefaults, ignoring the global storage.trace.block.version config. This replicates the approach from #6509 (live store fix): introduce a GlobalBlockConfig field injected by the application, and a coalesceBlockVersion function that resolves the encoding with proper fallback (default -> global -> local block_config). Fixes #6451 * refactor: extract shared CoalesceVersion helper, update LiveStore and manifest Extract version resolution into encoding.CoalesceVersion() so both block builder and live store share the same logic. The live store's module-specific WAL override chain is preserved by passing the extra WAL version argument. Regenerate the configuration manifest to reflect the removed hardcoded defaults.
zalegrala
pushed a commit
to zalegrala/tempo
that referenced
this pull request
Feb 27, 2026
…d WAL versions (grafana#6532) * fix: block builder honor the global storage block config for block and WAL versions The block builder was hardcoding the default encoding version in BlockConfig.RegisterFlagsAndApplyDefaults, ignoring the global storage.trace.block.version config. This replicates the approach from grafana#6509 (live store fix): introduce a GlobalBlockConfig field injected by the application, and a coalesceBlockVersion function that resolves the encoding with proper fallback (default -> global -> local block_config). Fixes grafana#6451 * refactor: extract shared CoalesceVersion helper, update LiveStore and manifest Extract version resolution into encoding.CoalesceVersion() so both block builder and live store share the same logic. The live store's module-specific WAL override chain is preserved by passing the extra WAL version argument. Regenerate the configuration manifest to reflect the removed hardcoded defaults.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What this PR does:
The live store currently hardcodes the completeBlock encoding to DefaultEncoding(), which means it can be configured to use vParquet5. This fixes it to honor the block config, but also fixes the fallbacks for it and the wal versions, to use the global storage.trace.block.version if nothing else overrides it.
This also moves the encoding check up a level, to the LiveStore from the instance, so that an invalid version will ensure a startup error.
Which issue(s) this PR fixes:
Fixes #
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]