fix: centralize block config and fix dedicated columns fallback in block_builder and live_store - #6647
Merged
Merged
Conversation
stoewer
marked this pull request as ready for review
March 11, 2026 12:49
stoewer
requested review from
carles-grafana,
electron0zero,
ie-pham,
javiermolinar,
knylander-grafana,
mapno,
mattdurham,
mdisibio,
oleg-kozlyuk-grafana,
ruslan-mikhailov,
yvrhdn and
zalegrala
as code owners
March 11, 2026 12:49
mdisibio
approved these changes
Mar 11, 2026
3 tasks
mattdurham
pushed a commit
to mattdurham/tempo
that referenced
this pull request
Jun 18, 2026
…ock_builder and live_store (grafana#6647) * Block config always taken from storage.trace.block * Fall back to dedicated columns from config if not set in overrides
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:
This PR centralizes block and WAL configuration so that
block_builderandlive_storealways get their block config fromstorage.trace.block. It's no longer possible to accidentally configure different block/WAL versions across components or configurelive_storeandblock_builderwith block configs. This simplifies the tempo config and makes it less error prone (we recently had multiple bugs in this area).It further fixes two bugs:
block_builderandlive_storewere ignoring the block config fromstorage.trace.blockblock_builderandlive_storewere also ignoring theparquet_dedicated_columnsfrom the config as well as the default dedicated columns whenparquet_dedicated_columnswere not set in the overridesWhich issue(s) this PR fixes:
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]