-
Notifications
You must be signed in to change notification settings - Fork 521
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.
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
[TraceQL Metrics] Remove all obsolete settings and code for RF3 metrics #3995
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I believe we can remove this as well:
https://github.com/grafana/tempo/blob/main/modules/frontend/combiner/metrics_query_range.go#L34-L48
@mdisibio I have found another 500 error response when the metrics-generator is disabled:
This comes from here:
when the Since this will be there for the whole release until RF1 is done, we should consider stopping early any traceql metric query if the generator is not enabled, with a more descriptive error. |
Thanks. That should stop the query already, when the querier job returns error to the frontend. By earlier do you mean do the check in the query-frontend? The new error could be a little cleaner but the query-frontend doesn't access the generator ring currently, and not sure I want to introduce that as a last-minute change. However the error message is incorrect, it was copy-and-pasted from the other API. Fixed that and a few others. |
The backport to
To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-3995-to-release-v2.6 origin/release-v2.6
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 43d932647732f236e09b21d149d0f9ea66199e5c When the conflicts are resolved, stage and commit the changes:
If you have the GitHub CLI installed: # Push the branch to GitHub:
git push --set-upstream origin backport-3995-to-release-v2.6
# Create the PR body template
PR_BODY=$(gh pr view 3995 --json body --template 'Backport 43d932647732f236e09b21d149d0f9ea66199e5c from #3995{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title '[release-v2.6] [TraceQL Metrics] Remove all obsolete settings and code for RF3 metrics' --body-file - --label 'type/bug' --label 'backport' --base release-v2.6 --milestone release-v2.6 --web Or, if you don't have the GitHub CLI installed (we recommend you install it!): # Push the branch to GitHub:
git push --set-upstream origin backport-3995-to-release-v2.6
# Create a pull request where the `base` branch is `release-v2.6` and the `compare`/`head` branch is `backport-3995-to-release-v2.6`.
# Remove the local backport branch
git switch main
git branch -D backport-3995-to-release-v2.6 |
…cs (#3995) (#4010) * Remove all obsolete settings and code for RF3 metrics. The only path going forward is RF1-based * Remove remaining references to rf1_read_path * changelog * Remove another reference to obsolete sampling rate * Update error messages for correctness (cherry picked from commit 43d9326) Co-authored-by: Martin Disibio <[email protected]>
What this PR does:
Deletes all obsolete settings and code for metrics queries against RF3 blocks. This path didn't scale, so we pivoted in the last release to a read path using RF1 blocks flushed from the generators. These don't need deduping or complex job handling, and it scales really well. This is the long-term duration, and some of the RF3 path is already broken accidentally by other feature additions, so it's good to delete it now.
This introduces some breaking changes against
main
builds in the past few months. (There is no breaking change with v2.5, these are unreleased features changing pre-2.6){ } | rate()
. If not enabled metrics queries fail with the errorlocalblocks processor not found
. Enabling the local-blocks processor can be done two ways:(a) . Per-tenant in the per-tenant overrides:
(b) or by default for all tenants in the main config:
Other changes:
sample
andjob_interval
are obsolete and were only parts of the RF3 sharding mechanism. These hints no longer do anything.Which issue(s) this PR fixes:
Fixes n/a
Checklist
CHANGELOG.md
updated - the order of entries should be[CHANGE]
,[FEATURE]
,[ENHANCEMENT]
,[BUGFIX]