Merge pull request #1676 from sherifabdlnaby/alloc-optimize

k8s-ci-robot · web-flow · commit 10dde2115c09 · 2022-02-10T05:07:47.000-08:00
Optimize Slice Allocations ( ~ -20% byte/op, ~ -20% ns/op, ~ -25% allocs )
diff --git a/internal/store/certificatesigningrequest.go b/internal/store/certificatesigningrequest.go
@@ -133,8 +133,7 @@ func wrapCSRFunc(f func(*certv1.CertificateSigningRequest) *metric.Family) func(
 		metricFamily := f(csr)
 
 		for _, m := range metricFamily.Metrics {
-			m.LabelKeys = append(descCSRLabelsDefaultLabels, m.LabelKeys...)
-			m.LabelValues = append([]string{csr.Name, csr.Spec.SignerName}, m.LabelValues...)
+			m.LabelKeys, m.LabelValues = mergeKeyValues(descCSRLabelsDefaultLabels, []string{csr.Name, csr.Spec.SignerName}, m.LabelKeys, m.LabelValues)
 		}
 
 		return metricFamily
diff --git a/internal/store/configmap.go b/internal/store/configmap.go
@@ -142,8 +142,7 @@ func wrapConfigMapFunc(f func(*v1.ConfigMap) *metric.Family) func(interface{}) *
 		metricFamily := f(configMap)
 
 		for _, m := range metricFamily.Metrics {
-			m.LabelKeys = append(descConfigMapLabelsDefaultLabels, m.LabelKeys...)
-			m.LabelValues = append([]string{configMap.Namespace, configMap.Name}, m.LabelValues...)
+			m.LabelKeys, m.LabelValues = mergeKeyValues(descConfigMapLabelsDefaultLabels, []string{configMap.Namespace, configMap.Name}, m.LabelKeys, m.LabelValues)
 		}
 
 		return metricFamily
diff --git a/internal/store/cronjob.go b/internal/store/cronjob.go
@@ -285,8 +285,7 @@ func wrapCronJobFunc(f func(*batchv1.CronJob) *metric.Family) func(interface{})
 		metricFamily := f(cronJob)
 
 		for _, m := range metricFamily.Metrics {
-			m.LabelKeys = append(descCronJobLabelsDefaultLabels, m.LabelKeys...)
-			m.LabelValues = append([]string{cronJob.Namespace, cronJob.Name}, m.LabelValues...)
+			m.LabelKeys, m.LabelValues = mergeKeyValues(descCronJobLabelsDefaultLabels, []string{cronJob.Namespace, cronJob.Name}, m.LabelKeys, m.LabelValues)
 		}
 
 		return metricFamily
diff --git a/internal/store/daemonset.go b/internal/store/daemonset.go
@@ -258,8 +258,7 @@ func wrapDaemonSetFunc(f func(*v1.DaemonSet) *metric.Family) func(interface{}) *
 		metricFamily := f(daemonSet)
 
 		for _, m := range metricFamily.Metrics {
-			m.LabelKeys = append(descDaemonSetLabelsDefaultLabels, m.LabelKeys...)
-			m.LabelValues = append([]string{daemonSet.Namespace, daemonSet.Name}, m.LabelValues...)
+			m.LabelKeys, m.LabelValues = mergeKeyValues(descDaemonSetLabelsDefaultLabels, []string{daemonSet.Namespace, daemonSet.Name}, m.LabelKeys, m.LabelValues)
 		}
 
 		return metricFamily
diff --git a/internal/store/deployment.go b/internal/store/deployment.go
@@ -314,8 +314,7 @@ func wrapDeploymentFunc(f func(*v1.Deployment) *metric.Family) func(interface{})
 		metricFamily := f(deployment)
 
 		for _, m := range metricFamily.Metrics {
-			m.LabelKeys = append(descDeploymentLabelsDefaultLabels, m.LabelKeys...)
-			m.LabelValues = append([]string{deployment.Namespace, deployment.Name}, m.LabelValues...)
+			m.LabelKeys, m.LabelValues = mergeKeyValues(descDeploymentLabelsDefaultLabels, []string{deployment.Namespace, deployment.Name}, m.LabelKeys, m.LabelValues)
 		}
 
 		return metricFamily
diff --git a/internal/store/endpoint.go b/internal/store/endpoint.go
@@ -182,8 +182,7 @@ func wrapEndpointFunc(f func(*v1.Endpoints) *metric.Family) func(interface{}) *m
 		metricFamily := f(endpoint)
 
 		for _, m := range metricFamily.Metrics {
-			m.LabelKeys = append(descEndpointLabelsDefaultLabels, m.LabelKeys...)
-			m.LabelValues = append([]string{endpoint.Namespace, endpoint.Name}, m.LabelValues...)
+			m.LabelKeys, m.LabelValues = mergeKeyValues(descEndpointLabelsDefaultLabels, []string{endpoint.Namespace, endpoint.Name}, m.LabelKeys, m.LabelValues)
 		}
 
 		return metricFamily
diff --git a/internal/store/horizontalpodautoscaler.go b/internal/store/horizontalpodautoscaler.go
@@ -286,8 +286,7 @@ func wrapHPAFunc(f func(*autoscaling.HorizontalPodAutoscaler) *metric.Family) fu
 		metricFamily := f(hpa)
 
 		for _, m := range metricFamily.Metrics {
-			m.LabelKeys = append(descHorizontalPodAutoscalerLabelsDefaultLabels, m.LabelKeys...)
-			m.LabelValues = append([]string{hpa.Namespace, hpa.Name}, m.LabelValues...)
+			m.LabelKeys, m.LabelValues = mergeKeyValues(descHorizontalPodAutoscalerLabelsDefaultLabels, []string{hpa.Namespace, hpa.Name}, m.LabelKeys, m.LabelValues)
 		}
 
 		return metricFamily
diff --git a/internal/store/ingress.go b/internal/store/ingress.go
@@ -185,8 +185,7 @@ func wrapIngressFunc(f func(*networkingv1.Ingress) *metric.Family) func(interfac
 		metricFamily := f(ingress)
 
 		for _, m := range metricFamily.Metrics {
-			m.LabelKeys = append(descIngressLabelsDefaultLabels, m.LabelKeys...)
-			m.LabelValues = append([]string{ingress.Namespace, ingress.Name}, m.LabelValues...)
+			m.LabelKeys, m.LabelValues = mergeKeyValues(descIngressLabelsDefaultLabels, []string{ingress.Namespace, ingress.Name}, m.LabelKeys, m.LabelValues)
 		}
 
 		return metricFamily
diff --git a/internal/store/job.go b/internal/store/job.go
@@ -387,8 +387,7 @@ func wrapJobFunc(f func(*v1batch.Job) *metric.Family) func(interface{}) *metric.
 		metricFamily := f(job)
 
 		for _, m := range metricFamily.Metrics {
-			m.LabelKeys = append(descJobLabelsDefaultLabels, m.LabelKeys...)
-			m.LabelValues = append([]string{job.Namespace, job.Name}, m.LabelValues...)
+			m.LabelKeys, m.LabelValues = mergeKeyValues(descJobLabelsDefaultLabels, []string{job.Namespace, job.Name}, m.LabelKeys, m.LabelValues)
 		}
 
 		return metricFamily
diff --git a/internal/store/lease.go b/internal/store/lease.go
@@ -97,8 +97,7 @@ func wrapLeaseFunc(f func(*coordinationv1.Lease) *metric.Family) func(interface{
 		metricFamily := f(lease)
 
 		for _, m := range metricFamily.Metrics {
-			m.LabelKeys = append(descLeaseLabelsDefaultLabels, m.LabelKeys...)
-			m.LabelValues = append([]string{lease.Name}, m.LabelValues...)
+			m.LabelKeys, m.LabelValues = mergeKeyValues(descLeaseLabelsDefaultLabels, []string{lease.Name}, m.LabelKeys, m.LabelValues)
 		}
 
 		return metricFamily
diff --git a/internal/store/limitrange.go b/internal/store/limitrange.go
@@ -119,8 +119,7 @@ func wrapLimitRangeFunc(f func(*v1.LimitRange) *metric.Family) func(interface{})
 		metricFamily := f(limitRange)
 
 		for _, m := range metricFamily.Metrics {
-			m.LabelKeys = append(descLimitRangeLabelsDefaultLabels, m.LabelKeys...)
-			m.LabelValues = append([]string{limitRange.Namespace, limitRange.Name}, m.LabelValues...)
+			m.LabelKeys, m.LabelValues = mergeKeyValues(descLimitRangeLabelsDefaultLabels, []string{limitRange.Namespace, limitRange.Name}, m.LabelKeys, m.LabelValues)
 		}
 
 		return metricFamily
diff --git a/internal/store/mutatingwebhookconfiguration.go b/internal/store/mutatingwebhookconfiguration.go
@@ -99,8 +99,7 @@ func wrapMutatingWebhookConfigurationFunc(f func(*admissionregistrationv1.Mutati
 		metricFamily := f(mutatingWebhookConfiguration)
 
 		for _, m := range metricFamily.Metrics {
-			m.LabelKeys = append(descMutatingWebhookConfigurationDefaultLabels, m.LabelKeys...)
-			m.LabelValues = append([]string{mutatingWebhookConfiguration.Namespace, mutatingWebhookConfiguration.Name}, m.LabelValues...)
+			m.LabelKeys, m.LabelValues = mergeKeyValues(descMutatingWebhookConfigurationDefaultLabels, []string{mutatingWebhookConfiguration.Namespace, mutatingWebhookConfiguration.Name}, m.LabelKeys, m.LabelValues)
 		}
 
 		return metricFamily
diff --git a/internal/store/namespace.go b/internal/store/namespace.go
@@ -155,8 +155,7 @@ func wrapNamespaceFunc(f func(*v1.Namespace) *metric.Family) func(interface{}) *
 		metricFamily := f(namespace)
 
 		for _, m := range metricFamily.Metrics {
-			m.LabelKeys = append(descNamespaceLabelsDefaultLabels, m.LabelKeys...)
-			m.LabelValues = append([]string{namespace.Name}, m.LabelValues...)
+			m.LabelKeys, m.LabelValues = mergeKeyValues(descNamespaceLabelsDefaultLabels, []string{namespace.Name}, m.LabelKeys, m.LabelValues)
 		}
 
 		return metricFamily
diff --git a/internal/store/networkpolicy.go b/internal/store/networkpolicy.go
@@ -137,8 +137,7 @@ func wrapNetworkPolicyFunc(f func(*networkingv1.NetworkPolicy) *metric.Family) f
 		metricFamily := f(networkPolicy)
 
 		for _, m := range metricFamily.Metrics {
-			m.LabelKeys = append(descNetworkPolicyLabelsDefaultLabels, m.LabelKeys...)
-			m.LabelValues = append([]string{networkPolicy.Namespace, networkPolicy.Name}, m.LabelValues...)
+			m.LabelKeys, m.LabelValues = mergeKeyValues(descNetworkPolicyLabelsDefaultLabels, []string{networkPolicy.Namespace, networkPolicy.Name}, m.LabelKeys, m.LabelValues)
 		}
 
 		return metricFamily
diff --git a/internal/store/node.go b/internal/store/node.go
@@ -446,8 +446,7 @@ func wrapNodeFunc(f func(*v1.Node) *metric.Family) func(interface{}) *metric.Fam
 		metricFamily := f(node)
 
 		for _, m := range metricFamily.Metrics {
-			m.LabelKeys = append(descNodeLabelsDefaultLabels, m.LabelKeys...)
-			m.LabelValues = append([]string{node.Name}, m.LabelValues...)
+			m.LabelKeys, m.LabelValues = mergeKeyValues(descNodeLabelsDefaultLabels, []string{node.Name}, m.LabelKeys, m.LabelValues)
 		}
 
 		return metricFamily
diff --git a/internal/store/persistentvolume.go b/internal/store/persistentvolume.go
@@ -266,8 +266,7 @@ func wrapPersistentVolumeFunc(f func(*v1.PersistentVolume) *metric.Family) func(
 		metricFamily := f(persistentVolume)
 
 		for _, m := range metricFamily.Metrics {
-			m.LabelKeys = append(descPersistentVolumeLabelsDefaultLabels, m.LabelKeys...)
-			m.LabelValues = append([]string{persistentVolume.Name}, m.LabelValues...)
+			m.LabelKeys, m.LabelValues = mergeKeyValues(descPersistentVolumeLabelsDefaultLabels, []string{persistentVolume.Name}, m.LabelKeys, m.LabelValues)
 		}
 
 		return metricFamily
diff --git a/internal/store/persistentvolumeclaim.go b/internal/store/persistentvolumeclaim.go
@@ -210,8 +210,7 @@ func wrapPersistentVolumeClaimFunc(f func(*v1.PersistentVolumeClaim) *metric.Fam
 		metricFamily := f(persistentVolumeClaim)
 
 		for _, m := range metricFamily.Metrics {
-			m.LabelKeys = append(descPersistentVolumeClaimLabelsDefaultLabels, m.LabelKeys...)
-			m.LabelValues = append([]string{persistentVolumeClaim.Namespace, persistentVolumeClaim.Name}, m.LabelValues...)
+			m.LabelKeys, m.LabelValues = mergeKeyValues(descPersistentVolumeClaimLabelsDefaultLabels, []string{persistentVolumeClaim.Namespace, persistentVolumeClaim.Name}, m.LabelKeys, m.LabelValues)
 		}
 
 		return metricFamily
diff --git a/internal/store/pod.go b/internal/store/pod.go
@@ -1365,8 +1365,7 @@ func wrapPodFunc(f func(*v1.Pod) *metric.Family) func(interface{}) *metric.Famil
 		metricFamily := f(pod)
 
 		for _, m := range metricFamily.Metrics {
-			m.LabelKeys = append(descPodLabelsDefaultLabels, m.LabelKeys...)
-			m.LabelValues = append([]string{pod.Namespace, pod.Name, string(pod.UID)}, m.LabelValues...)
+			m.LabelKeys, m.LabelValues = mergeKeyValues(descPodLabelsDefaultLabels, []string{pod.Namespace, pod.Name, string(pod.UID)}, m.LabelKeys, m.LabelValues)
 		}
 
 		return metricFamily
diff --git a/internal/store/poddisruptionbudget.go b/internal/store/poddisruptionbudget.go
@@ -180,8 +180,7 @@ func wrapPodDisruptionBudgetFunc(f func(*policyv1.PodDisruptionBudget) *metric.F
 		metricFamily := f(podDisruptionBudget)
 
 		for _, m := range metricFamily.Metrics {
-			m.LabelKeys = append(descPodDisruptionBudgetLabelsDefaultLabels, m.LabelKeys...)
-			m.LabelValues = append([]string{podDisruptionBudget.Namespace, podDisruptionBudget.Name}, m.LabelValues...)
+			m.LabelKeys, m.LabelValues = mergeKeyValues(descPodDisruptionBudgetLabelsDefaultLabels, []string{podDisruptionBudget.Namespace, podDisruptionBudget.Name}, m.LabelKeys, m.LabelValues)
 		}
 
 		return metricFamily
diff --git a/internal/store/replicaset.go b/internal/store/replicaset.go
@@ -245,8 +245,7 @@ func wrapReplicaSetFunc(f func(*v1.ReplicaSet) *metric.Family) func(interface{})
 		metricFamily := f(replicaSet)
 
 		for _, m := range metricFamily.Metrics {
-			m.LabelKeys = append(descReplicaSetLabelsDefaultLabels, m.LabelKeys...)
-			m.LabelValues = append([]string{replicaSet.Namespace, replicaSet.Name}, m.LabelValues...)
+			m.LabelKeys, m.LabelValues = mergeKeyValues(descReplicaSetLabelsDefaultLabels, []string{replicaSet.Namespace, replicaSet.Name}, m.LabelKeys, m.LabelValues)
 		}
 
 		return metricFamily
diff --git a/internal/store/replicationcontroller.go b/internal/store/replicationcontroller.go
@@ -209,8 +209,7 @@ func wrapReplicationControllerFunc(f func(*v1.ReplicationController) *metric.Fam
 		metricFamily := f(replicationController)
 
 		for _, m := range metricFamily.Metrics {
-			m.LabelKeys = append(descReplicationControllerLabelsDefaultLabels, m.LabelKeys...)
-			m.LabelValues = append([]string{replicationController.Namespace, replicationController.Name}, m.LabelValues...)
+			m.LabelKeys, m.LabelValues = mergeKeyValues(descReplicationControllerLabelsDefaultLabels, []string{replicationController.Namespace, replicationController.Name}, m.LabelKeys, m.LabelValues)
 		}
 
 		return metricFamily
diff --git a/internal/store/resourcequota.go b/internal/store/resourcequota.go
@@ -94,8 +94,7 @@ func wrapResourceQuotaFunc(f func(*v1.ResourceQuota) *metric.Family) func(interf
 		metricFamily := f(resourceQuota)
 
 		for _, m := range metricFamily.Metrics {
-			m.LabelKeys = append(descResourceQuotaLabelsDefaultLabels, m.LabelKeys...)
-			m.LabelValues = append([]string{resourceQuota.Namespace, resourceQuota.Name}, m.LabelValues...)
+			m.LabelKeys, m.LabelValues = mergeKeyValues(descResourceQuotaLabelsDefaultLabels, []string{resourceQuota.Namespace, resourceQuota.Name}, m.LabelKeys, m.LabelValues)
 		}
 
 		return metricFamily
diff --git a/internal/store/secret.go b/internal/store/secret.go
@@ -151,8 +151,7 @@ func wrapSecretFunc(f func(*v1.Secret) *metric.Family) func(interface{}) *metric
 		metricFamily := f(secret)
 
 		for _, m := range metricFamily.Metrics {
-			m.LabelKeys = append(descSecretLabelsDefaultLabels, m.LabelKeys...)
-			m.LabelValues = append([]string{secret.Namespace, secret.Name}, m.LabelValues...)
+			m.LabelKeys, m.LabelValues = mergeKeyValues(descSecretLabelsDefaultLabels, []string{secret.Namespace, secret.Name}, m.LabelKeys, m.LabelValues)
 		}
 
 		return metricFamily
diff --git a/internal/store/service.go b/internal/store/service.go
@@ -180,8 +180,7 @@ func wrapSvcFunc(f func(*v1.Service) *metric.Family) func(interface{}) *metric.F
 		metricFamily := f(svc)
 
 		for _, m := range metricFamily.Metrics {
-			m.LabelKeys = append(descServiceLabelsDefaultLabels, m.LabelKeys...)
-			m.LabelValues = append([]string{svc.Namespace, svc.Name}, m.LabelValues...)
+			m.LabelKeys, m.LabelValues = mergeKeyValues(descServiceLabelsDefaultLabels, []string{svc.Namespace, svc.Name}, m.LabelKeys, m.LabelValues)
 		}
 
 		return metricFamily
diff --git a/internal/store/statefulset.go b/internal/store/statefulset.go
@@ -262,8 +262,7 @@ func wrapStatefulSetFunc(f func(*v1.StatefulSet) *metric.Family) func(interface{
 		metricFamily := f(statefulSet)
 
 		for _, m := range metricFamily.Metrics {
-			m.LabelKeys = append(descStatefulSetLabelsDefaultLabels, m.LabelKeys...)
-			m.LabelValues = append([]string{statefulSet.Namespace, statefulSet.Name}, m.LabelValues...)
+			m.LabelKeys, m.LabelValues = mergeKeyValues(descStatefulSetLabelsDefaultLabels, []string{statefulSet.Namespace, statefulSet.Name}, m.LabelKeys, m.LabelValues)
 		}
 
 		return metricFamily
diff --git a/internal/store/storageclass.go b/internal/store/storageclass.go
@@ -127,8 +127,7 @@ func wrapStorageClassFunc(f func(*storagev1.StorageClass) *metric.Family) func(i
 		metricFamily := f(storageClass)
 
 		for _, m := range metricFamily.Metrics {
-			m.LabelKeys = append(descStorageClassLabelsDefaultLabels, m.LabelKeys...)
-			m.LabelValues = append([]string{storageClass.Name}, m.LabelValues...)
+			m.LabelKeys, m.LabelValues = mergeKeyValues(descStorageClassLabelsDefaultLabels, []string{storageClass.Name}, m.LabelKeys, m.LabelValues)
 		}
 
 		return metricFamily
diff --git a/internal/store/utils.go b/internal/store/utils.go
@@ -192,3 +192,25 @@ func createPrometheusLabelKeysValues(prefix string, allKubeData map[string]strin
 	}
 	return kubeMapToPrometheusLabels(prefix, allowedKubeData)
 }
+
+// mergeKeyValues merges label keys and values slice pairs into a single slice pair.
+// Arguments are passed as equal-length pairs of slices, where the first slice contains keys and second contains values.
+// Example: mergeKeyValues(keys1, values1, keys2, values2) => (keys1+keys2, values1+values2)
+func mergeKeyValues(keyValues ...[]string) (keys, values []string) {
+	capacity := 0
+	for i := 0; i < len(keyValues); i += 2 {
+		capacity += len(keyValues[i])
+	}
+
+	// Allocate one contiguous block, then split it up to keys and values zero'd slices.
+	keysValues := make([]string, 0, capacity*2)
+	keys = (keysValues[0:capacity:capacity])[:0]
+	values = (keysValues[capacity : capacity*2])[:0]
+
+	for i := 0; i < len(keyValues); i += 2 {
+		keys = append(keys, keyValues[i]...)
+		values = append(values, keyValues[i+1]...)
+	}
+
+	return keys, values
+}
diff --git a/internal/store/utils_test.go b/internal/store/utils_test.go
@@ -18,6 +18,7 @@ package store
 
 import (
 	"fmt"
+	"reflect"
 	"testing"
 
 	v1 "k8s.io/api/core/v1"
@@ -264,3 +265,57 @@ func TestKubeLabelsToPrometheusLabels(t *testing.T) {
 	}
 
 }
+
+func TestMergeKeyValues(t *testing.T) {
+	testCases := []struct {
+		name               string
+		keyValuePairSlices [][]string
+		expectKeys         []string
+		expectValues       []string
+	}{
+		{
+			name: "singlePair",
+			keyValuePairSlices: [][]string{
+				{"keyA", "keyB", "keyC"},
+				{"valueA", "valueB", "valueC"},
+			},
+			expectKeys:   []string{"keyA", "keyB", "keyC"},
+			expectValues: []string{"valueA", "valueB", "valueC"},
+		},
+		{
+			name: "evenPair",
+			keyValuePairSlices: [][]string{
+				{"keyA", "keyB", "keyC"},
+				{"valueA", "valueB", "valueC"},
+				{"keyX", "keyY", "keyZ"},
+				{"valueX", "valueY", "valueZ"},
+			},
+			expectKeys:   []string{"keyA", "keyB", "keyC", "keyX", "keyY", "keyZ"},
+			expectValues: []string{"valueA", "valueB", "valueC", "valueX", "valueY", "valueZ"},
+		},
+		{
+			name: "oddPair",
+			keyValuePairSlices: [][]string{
+				{"keyA", "keyB", "keyC"},
+				{"valueA", "valueB", "valueC"},
+				{"keyX", "keyY", "keyZ"},
+				{"valueX", "valueY", "valueZ"},
+				{"keyM", "keyN", "keyP"},
+				{"valueM", "valueN", "valueP"},
+			},
+			expectKeys:   []string{"keyA", "keyB", "keyC", "keyX", "keyY", "keyZ", "keyM", "keyN", "keyP"},
+			expectValues: []string{"valueA", "valueB", "valueC", "valueX", "valueY", "valueZ", "valueM", "valueN", "valueP"},
+		},
+	}
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			gotKeys, gotValues := mergeKeyValues(tc.keyValuePairSlices...)
+			if !reflect.DeepEqual(gotKeys, tc.expectKeys) {
+				t.Errorf("mergeKeyValues() got = %v, want %v", gotKeys, tc.expectKeys)
+			}
+			if !reflect.DeepEqual(gotValues, tc.expectValues) {
+				t.Errorf("mergeKeyValues() got1 = %v, want %v", gotValues, tc.expectValues)
+			}
+		})
+	}
+}
diff --git a/internal/store/validatingwebhookconfiguration.go b/internal/store/validatingwebhookconfiguration.go
@@ -99,8 +99,7 @@ func wrapValidatingWebhookConfigurationFunc(f func(*admissionregistrationv1.Vali
 		metricFamily := f(mutatingWebhookConfiguration)
 
 		for _, m := range metricFamily.Metrics {
-			m.LabelKeys = append(descValidatingWebhookConfigurationDefaultLabels, m.LabelKeys...)
-			m.LabelValues = append([]string{mutatingWebhookConfiguration.Namespace, mutatingWebhookConfiguration.Name}, m.LabelValues...)
+			m.LabelKeys, m.LabelValues = mergeKeyValues(descValidatingWebhookConfigurationDefaultLabels, []string{mutatingWebhookConfiguration.Namespace, mutatingWebhookConfiguration.Name}, m.LabelKeys, m.LabelValues)
 		}
 
 		return metricFamily
diff --git a/internal/store/verticalpodautoscaler.go b/internal/store/verticalpodautoscaler.go
@@ -288,8 +288,7 @@ func wrapVPAFunc(f func(*autoscaling.VerticalPodAutoscaler) *metric.Family) func
 		}
 
 		for _, m := range metricFamily.Metrics {
-			m.LabelKeys = append(descVerticalPodAutoscalerLabelsDefaultLabels, m.LabelKeys...)
-			m.LabelValues = append([]string{vpa.Namespace, vpa.Name, targetRef.APIVersion, targetRef.Kind, targetRef.Name}, m.LabelValues...)
+			m.LabelKeys, m.LabelValues = mergeKeyValues(descVerticalPodAutoscalerLabelsDefaultLabels, []string{vpa.Namespace, vpa.Name, targetRef.APIVersion, targetRef.Kind, targetRef.Name}, m.LabelKeys, m.LabelValues)
 		}
 
 		return metricFamily
diff --git a/internal/store/volumeattachment.go b/internal/store/volumeattachment.go
@@ -153,8 +153,7 @@ func wrapVolumeAttachmentFunc(f func(*storagev1.VolumeAttachment) *metric.Family
 		metricFamily := f(va)
 
 		for _, m := range metricFamily.Metrics {
-			m.LabelKeys = append(descVolumeAttachmentLabelsDefaultLabels, m.LabelKeys...)
-			m.LabelValues = append([]string{va.Name}, m.LabelValues...)
+			m.LabelKeys, m.LabelValues = mergeKeyValues(descVolumeAttachmentLabelsDefaultLabels, []string{va.Name}, m.LabelKeys, m.LabelValues)
 		}
 
 		return metricFamily

Original file line number	Diff line number	Diff line change
`@@ -133,8 +133,7 @@ func wrapCSRFunc(f func(certv1.CertificateSigningRequest) metric.Family) func(`
`133`	`133`	`metricFamily := f(csr)`
`134`	`134`
`135`	`135`	`for _, m := range metricFamily.Metrics {`
`136`		`- m.LabelKeys = append(descCSRLabelsDefaultLabels, m.LabelKeys...)`
`137`		`- m.LabelValues = append([]string{csr.Name, csr.Spec.SignerName}, m.LabelValues...)`
	`136`	`+ m.LabelKeys, m.LabelValues = mergeKeyValues(descCSRLabelsDefaultLabels, []string{csr.Name, csr.Spec.SignerName}, m.LabelKeys, m.LabelValues)`
`138`	`137`	`}`
`139`	`138`
`140`	`139`	`return metricFamily`
Original file line number	Diff line number	Diff line change
`@@ -142,8 +142,7 @@ func wrapConfigMapFunc(f func(v1.ConfigMap) metric.Family) func(interface{}) *`
`142`	`142`	`metricFamily := f(configMap)`
`143`	`143`
`144`	`144`	`for _, m := range metricFamily.Metrics {`
`145`		`- m.LabelKeys = append(descConfigMapLabelsDefaultLabels, m.LabelKeys...)`
`146`		`- m.LabelValues = append([]string{configMap.Namespace, configMap.Name}, m.LabelValues...)`
	`145`	`+ m.LabelKeys, m.LabelValues = mergeKeyValues(descConfigMapLabelsDefaultLabels, []string{configMap.Namespace, configMap.Name}, m.LabelKeys, m.LabelValues)`
`147`	`146`	`}`
`148`	`147`
`149`	`148`	`return metricFamily`
Original file line number	Diff line number	Diff line change
`@@ -285,8 +285,7 @@ func wrapCronJobFunc(f func(batchv1.CronJob) metric.Family) func(interface{})`
`285`	`285`	`metricFamily := f(cronJob)`
`286`	`286`
`287`	`287`	`for _, m := range metricFamily.Metrics {`
`288`		`- m.LabelKeys = append(descCronJobLabelsDefaultLabels, m.LabelKeys...)`
`289`		`- m.LabelValues = append([]string{cronJob.Namespace, cronJob.Name}, m.LabelValues...)`
	`288`	`+ m.LabelKeys, m.LabelValues = mergeKeyValues(descCronJobLabelsDefaultLabels, []string{cronJob.Namespace, cronJob.Name}, m.LabelKeys, m.LabelValues)`
`290`	`289`	`}`
`291`	`290`
`292`	`291`	`return metricFamily`
Original file line number	Diff line number	Diff line change
`@@ -258,8 +258,7 @@ func wrapDaemonSetFunc(f func(v1.DaemonSet) metric.Family) func(interface{}) *`
`258`	`258`	`metricFamily := f(daemonSet)`
`259`	`259`
`260`	`260`	`for _, m := range metricFamily.Metrics {`
`261`		`- m.LabelKeys = append(descDaemonSetLabelsDefaultLabels, m.LabelKeys...)`
`262`		`- m.LabelValues = append([]string{daemonSet.Namespace, daemonSet.Name}, m.LabelValues...)`
	`261`	`+ m.LabelKeys, m.LabelValues = mergeKeyValues(descDaemonSetLabelsDefaultLabels, []string{daemonSet.Namespace, daemonSet.Name}, m.LabelKeys, m.LabelValues)`
`263`	`262`	`}`
`264`	`263`
`265`	`264`	`return metricFamily`
Original file line number	Diff line number	Diff line change
`@@ -314,8 +314,7 @@ func wrapDeploymentFunc(f func(v1.Deployment) metric.Family) func(interface{})`
`314`	`314`	`metricFamily := f(deployment)`
`315`	`315`
`316`	`316`	`for _, m := range metricFamily.Metrics {`
`317`		`- m.LabelKeys = append(descDeploymentLabelsDefaultLabels, m.LabelKeys...)`
`318`		`- m.LabelValues = append([]string{deployment.Namespace, deployment.Name}, m.LabelValues...)`
	`317`	`+ m.LabelKeys, m.LabelValues = mergeKeyValues(descDeploymentLabelsDefaultLabels, []string{deployment.Namespace, deployment.Name}, m.LabelKeys, m.LabelValues)`
`319`	`318`	`}`
`320`	`319`
`321`	`320`	`return metricFamily`
Original file line number	Diff line number	Diff line change
`@@ -182,8 +182,7 @@ func wrapEndpointFunc(f func(v1.Endpoints) metric.Family) func(interface{}) *m`
`182`	`182`	`metricFamily := f(endpoint)`
`183`	`183`
`184`	`184`	`for _, m := range metricFamily.Metrics {`
`185`		`- m.LabelKeys = append(descEndpointLabelsDefaultLabels, m.LabelKeys...)`
`186`		`- m.LabelValues = append([]string{endpoint.Namespace, endpoint.Name}, m.LabelValues...)`
	`185`	`+ m.LabelKeys, m.LabelValues = mergeKeyValues(descEndpointLabelsDefaultLabels, []string{endpoint.Namespace, endpoint.Name}, m.LabelKeys, m.LabelValues)`
`187`	`186`	`}`
`188`	`187`
`189`	`188`	`return metricFamily`
Original file line number	Diff line number	Diff line change
`@@ -286,8 +286,7 @@ func wrapHPAFunc(f func(autoscaling.HorizontalPodAutoscaler) metric.Family) fu`
`286`	`286`	`metricFamily := f(hpa)`
`287`	`287`
`288`	`288`	`for _, m := range metricFamily.Metrics {`
`289`		`- m.LabelKeys = append(descHorizontalPodAutoscalerLabelsDefaultLabels, m.LabelKeys...)`
`290`		`- m.LabelValues = append([]string{hpa.Namespace, hpa.Name}, m.LabelValues...)`
	`289`	`+ m.LabelKeys, m.LabelValues = mergeKeyValues(descHorizontalPodAutoscalerLabelsDefaultLabels, []string{hpa.Namespace, hpa.Name}, m.LabelKeys, m.LabelValues)`
`291`	`290`	`}`
`292`	`291`
`293`	`292`	`return metricFamily`
Original file line number	Diff line number	Diff line change
`@@ -185,8 +185,7 @@ func wrapIngressFunc(f func(networkingv1.Ingress) metric.Family) func(interfac`
`185`	`185`	`metricFamily := f(ingress)`
`186`	`186`
`187`	`187`	`for _, m := range metricFamily.Metrics {`
`188`		`- m.LabelKeys = append(descIngressLabelsDefaultLabels, m.LabelKeys...)`
`189`		`- m.LabelValues = append([]string{ingress.Namespace, ingress.Name}, m.LabelValues...)`
	`188`	`+ m.LabelKeys, m.LabelValues = mergeKeyValues(descIngressLabelsDefaultLabels, []string{ingress.Namespace, ingress.Name}, m.LabelKeys, m.LabelValues)`
`190`	`189`	`}`
`191`	`190`
`192`	`191`	`return metricFamily`
Original file line number	Diff line number	Diff line change
`@@ -387,8 +387,7 @@ func wrapJobFunc(f func(v1batch.Job) metric.Family) func(interface{}) *metric.`
`387`	`387`	`metricFamily := f(job)`
`388`	`388`
`389`	`389`	`for _, m := range metricFamily.Metrics {`
`390`		`- m.LabelKeys = append(descJobLabelsDefaultLabels, m.LabelKeys...)`
`391`		`- m.LabelValues = append([]string{job.Namespace, job.Name}, m.LabelValues...)`
	`390`	`+ m.LabelKeys, m.LabelValues = mergeKeyValues(descJobLabelsDefaultLabels, []string{job.Namespace, job.Name}, m.LabelKeys, m.LabelValues)`
`392`	`391`	`}`
`393`	`392`
`394`	`393`	`return metricFamily`
Original file line number	Diff line number	Diff line change
`@@ -97,8 +97,7 @@ func wrapLeaseFunc(f func(coordinationv1.Lease) metric.Family) func(interface{`
`97`	`97`	`metricFamily := f(lease)`
`98`	`98`
`99`	`99`	`for _, m := range metricFamily.Metrics {`
`100`		`- m.LabelKeys = append(descLeaseLabelsDefaultLabels, m.LabelKeys...)`
`101`		`- m.LabelValues = append([]string{lease.Name}, m.LabelValues...)`
	`100`	`+ m.LabelKeys, m.LabelValues = mergeKeyValues(descLeaseLabelsDefaultLabels, []string{lease.Name}, m.LabelKeys, m.LabelValues)`
`102`	`101`	`}`
`103`	`102`
`104`	`103`	`return metricFamily`