Merge pull request kubernetes#2048 from murphd40/2047

2047: Add LabelsFromPath functionality to Info metrics
stackhpc · Apr 26, 2023 · 32f8c5e · 32f8c5e
2 parents b3157f7 + d16935b
commit 32f8c5e
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 6 deletions.
diff --git a/pkg/customresourcestate/registry_factory.go b/pkg/customresourcestate/registry_factory.go
@@ -325,17 +325,25 @@ func (c *compiledInfo) Values(v interface{}) (result []eachValue, errs []error)
 				continue
 			}
 		}
-		// labelFromKey logic
-		for key := range iter {
+
+		// labelFromKey / labelFromPath logic
+		for key, it := range iter {
+			labels := make(map[string]string)
+
 			if key != "" && c.labelFromKey != "" {
+				labels[c.labelFromKey] = key
+			}
+
+			addPathLabels(it, c.LabelFromPath(), labels)
+
+			if len(labels) > 0 {
 				result = append(result, eachValue{
-					Labels: map[string]string{
-						c.labelFromKey: key,
-					},
-					Value: 1,
+					Labels: labels,
+					Value:  1,
 				})
 			}
 		}
+
 		result = append(result, value...)
 	default:
 		result, errs = c.values(v)

diff --git a/pkg/customresourcestate/registry_factory_test.go b/pkg/customresourcestate/registry_factory_test.go
@@ -292,6 +292,17 @@ func Test_values(t *testing.T) {
 			newEachValue(t, 1, "type", "type-a"),
 			newEachValue(t, 1, "type", "type-b"),
 		}},
+		{name: "info label from path", each: &compiledInfo{
+			compiledCommon: compiledCommon{
+				path: mustCompilePath(t, "status", "sub"),
+				labelFromPath: map[string]valuePath{
+					"active": mustCompilePath(t, "active"),
+				},
+			},
+		}, wantResult: []eachValue{
+			newEachValue(t, 1, "active", "1"),
+			newEachValue(t, 1, "active", "3"),
+		}},
 		{name: "stateset", each: &compiledStateSet{
 			compiledCommon: compiledCommon{
 				path: mustCompilePath(t, "status", "phase"),