fix(metrics): populate dest_server label (#23246) #23269
Merged
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
❌ Preview Environment deleted from BunnyshellAvailable commands (reply to this comment):
|
|
Marked as draft because I need to work on the tests |
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #23269 +/- ##
=========================================
Coverage ? 59.96%
=========================================
Files ? 342
Lines ? 58573
Branches ? 0
=========================================
Hits ? 35125
Misses ? 20609
Partials ? 2839 ☔ View full report in Codecov by Sentry. |
crenshaw-dev
force-pushed
the
fix-dest-cluster-label
branch
from
bd4c240 to
2104ea2
Compare
Signed-off-by: Michael Crenshaw <[email protected]>
crenshaw-dev
force-pushed
the
fix-dest-cluster-label
branch
from
2104ea2 to
d4ba3dc
Compare
Signed-off-by: Michael Crenshaw <[email protected]>
crenshaw-dev
commented
Jun 6, 2025
| @@ -40,7 +44,7 @@ metadata: | |||
| spec: | |||
| destination: | |||
| namespace: dummy-namespace | |||
| server: https://localhost:6443 | |||
| name: cluster1 | |||
There was a problem hiding this comment.
I switched the test apps to destination name to force the logic that calculates dest_server based on name.
|
/cherry-pick release-3.0 |
agaudreault
approved these changes
Jun 6, 2025
|
Cherry-pick failed with |
crenshaw-dev
added a commit
that referenced
this pull request
Jun 6, 2025
Signed-off-by: Michael Crenshaw <[email protected]>
philippemerle
pushed a commit
to philippemerle/argoproj-argo-cd
that referenced
this pull request
Jun 7, 2025
…3269) Signed-off-by: Michael Crenshaw <[email protected]> Signed-off-by: Philippe Merle <[email protected]>
dsuhinin
pushed a commit
to dsuhinin/argo-cd
that referenced
this pull request
Jun 16, 2025
…3269) Signed-off-by: Michael Crenshaw <[email protected]> Signed-off-by: dsuhinin <[email protected]>
dsuhinin
pushed a commit
to dsuhinin/argo-cd
that referenced
this pull request
Jun 16, 2025
…3269) Signed-off-by: Michael Crenshaw <[email protected]> Signed-off-by: dsuhinin <[email protected]>
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.
#21189 simplified app controller behavior by avoiding inferring the app spec.destination.server field when not populated by the user. The refactor replaces that inference with logic that explicitly loads the destination server URL when it's needed.
The original PR missed some spots. One spot was the places where the inferred server URL was used for metrics.
This PR adds logic to populate the server URL for metrics. The costs are complexity and potential performance loss.
When encountering an error getting the server URL, I'm opting to log a warning and push the metric. I think having a metric with an unpopulated label is better than no metric at all.
Testing:
I switched the metrics tests from server-based to name-based destination, and that caused 4 metrics tests to fail, reproducing the issue. I also reproduced the issue locally with these:
The changes fix the unit tests and the manual test.
Fixes #23246