plugin/metrics: Reorder registry in args

Helps with a follow-up change. Basically, when building and configuring
metrics, it's more natural for additional configuration options to be
added to the end, which requires that the registry passed to these
functions to be the first argument, rather than the last.

Author: sharnoff

pkg/plugin/globalstate.go

@@ -89,7 +89,7 @@ func NewPluginState(
 
 	indexedNodeStore := watch.NewIndexedStore(nodeWatchStore, watch.NewFlatNameIndex[corev1.Node]())
 
-	metrics := metrics.BuildPluginMetrics(config.NodeMetricLabels, reg)
+	metrics := metrics.BuildPluginMetrics(reg, config.NodeMetricLabels)
 
 	return &PluginState{
 		mu: sync.Mutex{},

pkg/plugin/metrics/framework.go

@@ -50,7 +50,7 @@ func (m *Framework) IncReserveOverBudget(ignored bool, node *state.Node) {
 	m.reserveOverBudget.WithLabelValues(labelValues...).Inc()
 }
 
-func buildSchedFrameworkMetrics(labels nodeLabeling, reg prometheus.Registerer) Framework {
+func buildSchedFrameworkMetrics(reg prometheus.Registerer, labels nodeLabeling) Framework {
 	reserveLabels := []string{"node"}
 	reserveLabels = append(reserveLabels, labels.metricLabelNames...)
 	reserveLabels = append(reserveLabels, "ignored_namespace")

pkg/plugin/metrics/metrics.go

@@ -29,13 +29,13 @@ type Plugin struct {
 	K8sOps *prometheus.CounterVec
 }
 
-func BuildPluginMetrics(nodeMetricLabels map[string]string, reg prometheus.Registerer) Plugin {
+func BuildPluginMetrics(reg prometheus.Registerer, nodeMetricLabels map[string]string) Plugin {
 	nodeLabels := buildNodeLabels(nodeMetricLabels)
 
 	return Plugin{
 		nodeLabels: nodeLabels,
-		Framework:  buildSchedFrameworkMetrics(nodeLabels, reg),
-		Nodes:      buildNodeMetrics(nodeLabels, reg),
+		Framework:  buildSchedFrameworkMetrics(reg, nodeLabels),
+		Nodes:      buildNodeMetrics(reg, nodeLabels),
 		Reconcile:  buildReconcileMetrics(reg),
 
 		ResourceRequests: util.RegisterMetric(reg, prometheus.NewCounterVec(

pkg/plugin/metrics/node.go

@@ -23,7 +23,7 @@ type Node struct {
 	mem *prometheus.GaugeVec
 }
 
-func buildNodeMetrics(labels nodeLabeling, reg prometheus.Registerer) *Node {
+func buildNodeMetrics(reg prometheus.Registerer, labels nodeLabeling) *Node {
 	finalMetricLabels := []string{"node"}
 	finalMetricLabels = append(finalMetricLabels, labels.metricLabelNames...)
 	finalMetricLabels = append(finalMetricLabels, "field")