feat(registry): derive Ord and PartialOrd for SubnetType#9357
feat(registry): derive Ord and PartialOrd for SubnetType#9357severin-amrein merged 1 commit intomasterfrom
Conversation
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
There was a problem hiding this comment.
This pull request changes code owned by the Governance team. Therefore, make sure that
you have considered the following (for Governance-owned code):
-
Update
unreleased_changelog.md(if there are behavior changes, even if they are
non-breaking). -
Are there BREAKING changes?
-
Is a data migration needed?
-
Security review?
How to Satisfy This Automatic Review
-
Go to the bottom of the pull request page.
-
Look for where it says this bot is requesting changes.
-
Click the three dots to the right.
-
Select "Dismiss review".
-
In the text entry box, respond to each of the numbered items in the previous
section, declare one of the following:
-
Done.
-
$REASON_WHY_NO_NEED. E.g. for
unreleased_changelog.md, "No
canister behavior changes.", or for item 2, "Existing APIs
behave as before.".
Brief Guide to "Externally Visible" Changes
"Externally visible behavior change" is very often due to some NEW canister API.
Changes to EXISTING APIs are more likely to be "breaking".
If these changes are breaking, make sure that clients know how to migrate, how to
maintain their continuity of operations.
If your changes are behind a feature flag, then, do NOT add entrie(s) to
unreleased_changelog.md in this PR! But rather, add entrie(s) later, in the PR
that enables these changes in production.
Reference(s)
For a more comprehensive checklist, see here.
GOVERNANCE_CHECKLIST_REMINDER_DEDUP
severin-amrein
dismissed
github-actions[bot]’s stale review
no behavior changes
…pe targets Bump IC library dependencies to revision 0e614ebbb23a which includes Ord/PartialOrd derives on SubnetType (dfinity/ic#9357). Add subnet_type: Option<SubnetType> to TargetGroup and TargetDto. Fetch the subnet type from the registry via SubnetRegistry::get_subnet_type() and propagate it through to both the file_sd (ServiceDiscoveryRecord) and multiservice-discovery (PrometheusConfigBuilder) label emission paths as the ic_subnet_type label. This enables downstream VMAgent relabel configs to filter scrape targets by subnet type (e.g. keep only cloud_engine subnets for Control Panel metrics forwarding). Also fixes a pre-existing broken test in prometheus_updater.rs where TargetGroup was constructed with Option fields that no longer exist.
2 participants
Motivation
The DRE multiservice-discovery (MSD) crate needs to add a
subnet_type: Option<SubnetType>field toTargetGroupandTargetDtostructs, which are stored inBTreeSetand therefore require all fields to implementOrd. CurrentlySubnetTypeonly derivesEq/PartialEq, so it cannot be used in ordered collections.This adds
OrdandPartialOrdto the derive list, enabling downstream consumers (like MSD) to includeSubnetTypein structs that participate inBTreeSet/BTreeMapcollections. The derived ordering follows variant declaration order (Application < System < VerifiedApplication < CloudEngine), which is a reasonable default.Test Protocol
cargo check -p ic-registry-subnet-type— compiles cleanly