github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-01 07:47:56 +00:00
Code Issues Projects Releases Wiki Activity

chore: Use generic sets for metrics

Browse Source 
The sets.String has been deprecated.
This commit is contained in:
yongruilin 2024-10-16 14:29:06 -07:00
parent b664351284
commit c9979e6fbc
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
staging/src/k8s.io/component-base/metrics/opts.go
View File

@ -315,7 +315,7 @@ func (o *SummaryOpts) toPromSummaryOpts() prometheus.SummaryOpts {
} }
type MetricLabelAllowList struct { type MetricLabelAllowList struct {
labelToAllowList map[string]sets.String labelToAllowList map[string]sets.Set[string]
} }
func (allowList *MetricLabelAllowList) ConstrainToAllowedList(labelNameList, labelValueList []string) { func (allowList *MetricLabelAllowList) ConstrainToAllowedList(labelNameList, labelValueList []string) {
@ -347,13 +347,13 @@ func SetLabelAllowListFromCLI(allowListMapping map[string]string) {
for metricLabelName, labelValues := range allowListMapping { for metricLabelName, labelValues := range allowListMapping {
metricName := strings.Split(metricLabelName, ",")[0] metricName := strings.Split(metricLabelName, ",")[0]
labelName := strings.Split(metricLabelName, ",")[1] labelName := strings.Split(metricLabelName, ",")[1]
valueSet := sets.NewString(strings.Split(labelValues, ",")...) valueSet := sets.New[string](strings.Split(labelValues, ",")...)
allowList, ok := labelValueAllowLists[metricName] allowList, ok := labelValueAllowLists[metricName]
if ok { if ok {
allowList.labelToAllowList[labelName] = valueSet allowList.labelToAllowList[labelName] = valueSet
} else { } else {
labelToAllowList := make(map[string]sets.String) labelToAllowList := make(map[string]sets.Set[string])
labelToAllowList[labelName] = valueSet labelToAllowList[labelName] = valueSet
labelValueAllowLists[metricName] = &MetricLabelAllowList{ labelValueAllowLists[metricName] = &MetricLabelAllowList{
labelToAllowList, labelToAllowList,

16
staging/src/k8s.io/component-base/metrics/opts_test.go
View File

@ -65,8 +65,8 @@ func TestDefaultStabilityLevel(t *testing.T) {
func TestConstrainToAllowedList(t *testing.T) { func TestConstrainToAllowedList(t *testing.T) {
allowList := &MetricLabelAllowList{ allowList := &MetricLabelAllowList{
labelToAllowList: map[string]sets.String{ labelToAllowList: map[string]sets.Set[string]{
"label_a": sets.NewString("allow_value1", "allow_value2"), "label_a": sets.New[string]("allow_value1", "allow_value2"),
}, },
} }
labelNameList := []string{"label_a", "label_b"} labelNameList := []string{"label_a", "label_b"}
@ -98,8 +98,8 @@ func TestConstrainToAllowedList(t *testing.T) {
func TestConstrainLabelMap(t *testing.T) { func TestConstrainLabelMap(t *testing.T) {
allowList := &MetricLabelAllowList{ allowList := &MetricLabelAllowList{
labelToAllowList: map[string]sets.String{ labelToAllowList: map[string]sets.Set[string]{
"label_a": sets.NewString("allow_value1", "allow_value2"), "label_a": sets.New[string]("allow_value1", "allow_value2"),
}, },
} }
var tests = []struct { var tests = []struct {
@ -154,13 +154,13 @@ func TestSetLabelAllowListFromManifest(t *testing.T) {
metric2,label2: v3`, metric2,label2: v3`,
expectlabelValueAllowLists: map[string]*MetricLabelAllowList{ expectlabelValueAllowLists: map[string]*MetricLabelAllowList{
"metric1": { "metric1": {
labelToAllowList: map[string]sets.String{ labelToAllowList: map[string]sets.Set[string]{
"label1": sets.NewString("v1", "v2"), "label1": sets.New[string]("v1", "v2"),
}, },
}, },
"metric2": { "metric2": {
labelToAllowList: map[string]sets.String{ labelToAllowList: map[string]sets.Set[string]{
"label2": sets.NewString("v3"), "label2": sets.New[string]("v3"),
}, },
}, },
}, },