Skip to content

Commit 59860ab

Browse files
committed
feat(customresource) log no _info suffix in name only once per reading the configuration
1 parent aff4d97 commit 59860ab

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

pkg/customresourcestate/registry_factory.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,10 @@ func compileCommon(c MetricMeta) (*compiledCommon, error) {
7272
func compileFamily(f Generator, resource Resource) (*compiledFamily, error) {
7373
labels := resource.Labels.Merge(f.Labels)
7474

75+
if f.Each.Type == MetricTypeInfo && !strings.HasSuffix(f.Name, "_info") {
76+
klog.InfoS("Info metric does not have _info suffix", "gvk", resource.GroupVersionKind.String(), "name", f.Name)
77+
}
78+
7579
metric, err := newCompiledMetric(f.Each)
7680
if err != nil {
7781
return nil, fmt.Errorf("compiling metric: %w", err)

pkg/metric_generator/generator.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import (
2121
"strings"
2222

2323
basemetrics "k8s.io/component-base/metrics"
24-
"k8s.io/klog/v2"
2524

2625
"k8s.io/kube-state-metrics/v2/pkg/metric"
2726
)
@@ -74,10 +73,6 @@ func (g *FamilyGenerator) Generate(obj interface{}) *metric.Family {
7473
family := g.GenerateFunc(obj)
7574
family.Name = g.Name
7675
family.Type = g.Type
77-
// OpenMetrics spec requires that all Info metrics have a _info suffix.
78-
if family.Type == metric.Info && !strings.HasSuffix(family.Name, "_info") {
79-
klog.InfoS("Info metric %s does not have _info suffix", family.Name)
80-
}
8176
return family
8277
}
8378

0 commit comments

Comments
 (0)