Remove rf1_after from query frontend and query paths#6969
Merged
mapno merged 2 commits intografana:mainfrom Apr 15, 2026
Merged
Remove rf1_after from query frontend and query paths#6969mapno merged 2 commits intografana:mainfrom
mapno merged 2 commits intografana:mainfrom
Conversation
mapno
force-pushed
the
remove-rf1-after-frontend
branch
from
6db175f to
3deda20
Compare
Contributor
There was a problem hiding this comment.
Pull request overview
Removes rf1_after-based replication-factor filtering from non-metrics query paths so mixed RF3/RF1 block stores can be queried without special migration configuration, while keeping metrics queries restricted to RF1 blocks.
Changes:
- Stop filtering backend blocks by replication factor for trace-by-ID, search, and tag/tag-values queries (query all blocks and dedupe at query time).
- Remove
rf1AfterHTTP query parameter handling and frontend propagation/sharder logic for non-metrics paths. - Mark
rf1_afteras deprecated/ignored in config and update examples/docs/tests accordingly (metrics path remains RF1-only).
Reviewed changes
Copilot reviewed 27 out of 27 changed files in this pull request and generated 5 comments.
Show a summary per file
| File | Description |
|---|---|
tempodb/tempodb.go |
Drops RF-based inclusion logic for backend block selection in Find/compacted blocks. |
tempodb/encoding/common/interfaces.go |
Removes RF1After from SearchOptions. |
pkg/tempopb/tempo.proto |
Keeps RF1After proto fields but annotates as deprecated via comments. |
pkg/tempopb/tempo.pb.go |
Regenerated output reflecting proto comment/format changes. |
pkg/api/search_tags.go |
Removes parsing of rf1After from tag/tag-values HTTP request parsing. |
pkg/api/http.go |
Removes rf1After URL param constant, parsing, and request-building propagation; updates trace-by-ID validation signature. |
pkg/api/http_test.go |
Updates ValidateAndSanitizeRequest tests for new return signature (no rf1After). |
modules/querier/querier.go |
Stops passing RF1After into store search options for trace-by-ID. |
modules/querier/http.go |
Stops reading/logging/forwarding rf1After for trace-by-ID handlers. |
modules/frontend/util.go |
Replaces rf1FilterFn with an acceptAllBlocks filter. |
modules/frontend/traceid_sharder.go |
Stops propagating rf1After into sharded trace-by-ID backend requests. |
modules/frontend/traceid_handlers.go |
Updates validation call sites for new signature (no rf1After). |
modules/frontend/tag_sharder.go |
Removes rf1After from tag sharding interface and queries all blocks. |
modules/frontend/tag_sharder_test.go |
Updates fake request type to match tag sharder interface change. |
modules/frontend/search_sharder.go |
Removes RF1After config and queries all blocks in backend sharding. |
modules/frontend/search_sharder_test.go |
Removes RF1After filtering test (no longer applicable). |
modules/frontend/search_handlers_test.go |
Updates expected job/block metrics due to scanning more blocks. |
modules/frontend/frontend.go |
Removes RF1After propagation wiring; clarifies filterFn is generic. |
modules/frontend/config.go |
Marks rf1_after config as deprecated/ignored (still accepted). |
integration/util/config-base.yaml |
Removes query_frontend.rf1_after from integration base config. |
example/docker-compose/*/tempo.yaml |
Removes query_frontend.rf1_after from example configs. |
docs/sources/tempo/configuration/manifest.md |
Removes rf1_after from the rendered config manifest snippet. |
cmd/tempo-vulture/main.go |
Deprecates the vulture flag help text and removes rf1After query-param injection. |
mapno
force-pushed
the
remove-rf1-after-frontend
branch
from
3deda20 to
dd83352
Compare
mapno
force-pushed
the
remove-rf1-after-frontend
branch
from
dd83352 to
5debdea
Compare
mapno
force-pushed
the
remove-rf1-after-frontend
branch
from
5debdea to
90e44c3
Compare
Query all blocks regardless of replication factor for non-metrics paths (search, tags, trace-by-ID). Metrics queries continue to filter RF1-only. The rf1_after config field is kept but deprecated for YAML backward compatibility. Proto fields are marked deprecated for wire compatibility. Fixes grafana#6960
mapno
force-pushed
the
remove-rf1-after-frontend
branch
from
90e44c3 to
3fccc56
Compare
mapno
requested review from
carles-grafana,
electron0zero,
ie-pham,
javiermolinar,
mattdurham,
mdisibio,
oleg-kozlyuk-grafana,
ruslan-mikhailov,
stoewer,
yvrhdn and
zalegrala
as code owners
| URLParamRF1After = "rf1After" | ||
| urlMaxSeries = "maxSeries" | ||
| urlInstant = "instant" | ||
|
|
There was a problem hiding this comment.
URLParamRF1After was an exported constant in pkg/api and is now removed. Even if the query param is deprecated/ignored, removing the symbol is a Go API breaking change for any downstream code importing this module (including external tooling). Consider keeping the constant (deprecated in a comment) so existing code still compiles, while leaving the parsing behavior as-is (ignored).
Suggested change
| // Deprecated: URLParamRF1After is kept for source compatibility only. | |
| // The corresponding query parameter is deprecated and ignored. | |
| URLParamRF1After = "rf1_after" |
| @@ -41,7 +41,7 @@ type Config struct { | |||
| AllowedHeaders []string `yaml:"allowed_headers,omitempty"` | |||
|
|
|||
| // RF1After specifies the time after which RF1 logic is applied. | |||
There was a problem hiding this comment.
The field-level comment for RF1After still says it "specifies the time after which RF1 logic is applied", but the same line now marks it as deprecated/ignored. Can we update the comment to avoid implying it still affects behavior (and maybe point users to the new behavior: non-metrics query paths ignore RF entirely)?
Suggested change
| // RF1After specifies the time after which RF1 logic is applied. | |
| // RF1After is deprecated and ignored. Non-metrics query paths ignore RF entirely. |
Contributor
Author
There was a problem hiding this comment.
It's marked as deprecated just below.
mattdurham
reviewed
Apr 15, 2026
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
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:
Simplifies the 2.x to 3.0 migration by removing the need to configure
rf1_after. Non-metric query paths (search, tags, trace-by-ID) now inspect all blocks regardless of replication factor, with deduplication at query time. This means mixed RF3/RF1 block stores work without configuration.Metric queries continue to select RF1 blocks only, as they require deduplicated data.
The
rf1_afterconfig field and proto fields are kept for backward compatibility, but the intention is to remove them before the v3.0 release.Which issue(s) this PR fixes:
Fixes #6960
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]