Remove global metrics provider and unify workqueue metric naming #40884
Conversation
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
9e4402e to
acf821d
Compare
tommyp1ckles
commented
Aug 8, 2025
acf821d to
e481aa5
Compare
|
/test |
e481aa5 to
1a7e1ed
Compare
mhofstetter
approved these changes
Aug 18, 2025
rgo3
approved these changes
Aug 18, 2025
christarazi
approved these changes
Aug 18, 2025
1a7e1ed to
7526fee
Compare
|
/test |
Yeah, great idea, changed it to this and was able to drop all the test refactoring. |
7526fee to
aaa1cab
Compare
|
/test |
|
/test |
This global provider was always problematic: * Caused operator metrics to use the Agent cilium_* namespace. * Global register was brittle and relied on implicit ordering of init() functions. This removes the global provider and instead opts to provide one via hive. As well, any k8s watcher workqueue configs without a explicit config (i.e. relying on the global RegisterProvider) will now use the provided provider. Signed-off-by: Tom Hadlaw <tom.hadlaw@isovalent.com>
These are now fixed to always be under the correct namespace. Signed-off-by: Tom Hadlaw <tom.hadlaw@isovalent.com>
aaa1cab to
98d3391
Compare
|
/test |
harsimran-pabla
approved these changes
Aug 26, 2025
aditighag
approved these changes
Aug 27, 2025
hemanthmalla
approved these changes
Aug 28, 2025
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.
The way we registered the k8s global work-queue metrics has always been prone to breaking, as it depended on the specific ordering of evaluation of init functions, as is explained in this comment:
cilium/pkg/k8s/watchers/metrics.go
Lines 20 to 31 in 6c82bc4
This was already causing problems in the Operator resulting in missing metrics when trying to move the
watchers/metrics.gofile to a separate package. Clearly trying to trick Go into evaluating our init funcs before a code libraries wasn't a good approach moving forward.As a result, recent changes have moved operator related workqueue configs to explicitly define the provider via a global variable. This fixes the problem of the
init()registry race condition but it results in some Operator workqueue metrics now being prefixed with the agent metrics namespace (i.e.cilium_). Previously this was broken as well as because metrics registered via the global registry were not registered with the cilium prefix many such metrics were missing thecilium_prefix, leading to inconsistent metric naming.This follows up those changes and takes another step in cleaning all this up by removing the global MetricsProvider and explicitly passing a Hive provided one to each workqueue (i.e. notably, many of the resource watchers use these to setup K8s object events). The result is a wide refactor requiring a lot of fixed tests and addition of MetricsProvider to a lot of Hive constructor parameters - thus the separate pull request.
https://github.com/cilium/cilium/pull/40884/files#diff-8b8e02278a63139306486adc431761b5b2dd9847df5559f95acd90d9a921fb6bL44-L49