[Option 1] Add clickhouse_node tag to query metrics - #24627
Draft
sangeetashivaji wants to merge 2 commits into
Draft
[Option 1] Add clickhouse_node tag to query metrics#24627sangeetashivaji wants to merge 2 commits into
sangeetashivaji wants to merge 2 commits into
Conversation
Preserve the per-node dimension in the query-metrics path and emit a clickhouse_node tag per node, matching the tag the standard (non-DBM) ClickHouse metrics already use. Rows are kept per-(query, node) and one metrics payload is submitted per node. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Contributor
Validation ReportAll 21 validations passed. Show details
|
Contributor
🎉 All green!🧪 All tests passed 🎯 Code Coverage (details) 🔗 Commit SHA: 6ae55e7 | Docs | Datadog PR Page | Give us feedback! |
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 does this PR do?
Adds a
clickhouse_nodetag to ClickHouse DBM query metrics so per-node data can be sliced in-app. Query metrics previously readhostName() as server_nodeonly for per-node checkpointing, then collapsed the node dimension via_merge_rows_across_nodesbefore emitting.This change:
server_nodeon each row and removing the cross-node merge.clickhouse_node:<node>to that payload's tags (reusingCLUSTER_NODE_TAGfromutils.py, the same key the standard non-DBM metrics already emit).server_nodein the FQT row-identity key so the same query on different nodes is tracked distinctly. FQT events themselves are unchanged (node is not a meaningful dimension for the query-text catalog).This is "Plan 1" (agent-only delivery). A follow-up "Plan 2" will align with the DBM-standard row-field + backend-materialization pattern used by postgres/mysql/sqlserver.
Motivation
The standard (non-DBM) ClickHouse metrics already tag per-node data with
clickhouse_node, but the DBM checks do not expose that dimension. This brings the node-level tag to query metrics first, as the initial step of rolling it out across all DBM checks.Review checklist (to be filled by reviewers)
qa/requiredif this PR needs QA validation, orqa/skip-qaif it does not. Exactly one of the two is required.backport/<branch-name>label to the PR and it will automatically open a backport PR once this one is merged