improve

Author: chrischdi

exp/metric-gen/markers/helper_types.go renamed to exp/metric-gen/markers/helper.go

@@ -19,7 +19,10 @@ import (
 	"fmt"
 
 	"k8s.io/client-go/util/jsonpath"
+	"k8s.io/klog/v2"
 	ctrlmarkers "sigs.k8s.io/controller-tools/pkg/markers"
+
+	"k8s.io/kube-state-metrics/v2/pkg/customresourcestate"
 )
 
 type markerDefinitionWithHelp struct {
@@ -85,3 +88,34 @@ func (j jsonPath) Parse() ([]string, error) {
 
 	return ret, nil
 }
+
+func newMetricMeta(basePath []string, j jsonPath, jsonLabelsFromPath map[string]jsonPath) customresourcestate.MetricMeta {
+	path := basePath
+	if j != "" {
+		valueFrom, err := j.Parse()
+		if err != nil {
+			klog.Fatal(err)
+		}
+		if len(valueFrom) > 0 {
+			path = append(path, valueFrom...)
+		}
+	}
+
+	labelsFromPath := map[string][]string{}
+	for k, v := range jsonLabelsFromPath {
+		path := []string{}
+		var err error
+		if v != "." {
+			path, err = v.Parse()
+			if err != nil {
+				klog.Fatal(err)
+			}
+		}
+		labelsFromPath[k] = path
+	}
+
+	return customresourcestate.MetricMeta{
+		Path:           path,
+		LabelsFromPath: labelsFromPath,
+	}
+}

exp/metric-gen/markers/markers.go

@@ -34,15 +34,14 @@ var (
 
 // +controllertools:marker:generateHelp:category=CRD
 
-// ResourceMarker is a marker that knows how to apply itself to a particular
-// version in a CRD Spec.
+// ResourceMarker is a marker that configures a custom resource.
 type ResourceMarker interface {
 	// ApplyToCRD applies this marker to the given CRD, in the given version
 	// within that CRD.  It's called after everything else in the CRD is populated.
 	ApplyToResource(resource *customresourcestate.Resource) error
 }
 
-// LocalGeneratorMarker is a marker that knows how to create a generator from itself.
+// LocalGeneratorMarker is a marker that creates a custom resource metric generator.
 type LocalGeneratorMarker interface {
 	// ApplyToCRD applies this marker to the given CRD, in the given version
 	// within that CRD.  It's called after everything else in the CRD is populated.

exp/metric-gen/markers/metric_gauge.go

@@ -62,10 +62,7 @@ func (gaugeMarker) help() *markers.DefinitionHelp {
 }
 
 func (g gaugeMarker) ToGenerator(basePath ...string) *customresourcestate.Generator {
-	additionalPath, err := g.JSONPath.Parse()
-	if err != nil {
-		klog.Fatal(err)
-	}
+	var err error
 	var valueFrom []string
 	if g.ValueFrom != nil {
 		valueFrom, err = g.ValueFrom.Parse()
@@ -74,33 +71,14 @@ func (g gaugeMarker) ToGenerator(basePath ...string) *customresourcestate.Genera
 		}
 	}
 
-	labelsFromPath := map[string][]string{}
-	for k, v := range g.LabelsFromPath {
-		path := []string{}
-		var err error
-		if v != "." {
-			path, err = v.Parse()
-			if err != nil {
-				klog.Fatal(err)
-			}
-		}
-		labelsFromPath[k] = path
-	}
-
-	// nolint:gocritic
-	path := append(basePath, additionalPath...)
-
 	return &customresourcestate.Generator{
 		Name: g.Name,
 		Help: g.Help,
 		Each: customresourcestate.Metric{
 			Type: customresourcestate.MetricTypeGauge,
 			Gauge: &customresourcestate.MetricGauge{
-				NilIsZero: g.NilIsZero,
-				MetricMeta: customresourcestate.MetricMeta{
-					Path:           path,
-					LabelsFromPath: labelsFromPath,
-				},
+				NilIsZero:    g.NilIsZero,
+				MetricMeta:   newMetricMeta(basePath, g.JSONPath, g.LabelsFromPath),
 				LabelFromKey: g.LabelFromKey,
 				ValueFrom:    valueFrom,
 			},

exp/metric-gen/markers/metric_info.go

@@ -18,8 +18,6 @@ package markers
 import (
 	"sigs.k8s.io/controller-tools/pkg/markers"
 
-	"k8s.io/klog/v2"
-
 	"k8s.io/kube-state-metrics/v2/pkg/customresourcestate"
 )
 
@@ -60,40 +58,13 @@ func (infoMarker) help() *markers.DefinitionHelp {
 }
 
 func (i infoMarker) ToGenerator(basePath ...string) *customresourcestate.Generator {
-	path := basePath
-	if i.JSONPath != "" {
-		valueFrom, err := i.JSONPath.Parse()
-		if err != nil {
-			klog.Fatal(err)
-		}
-		if len(valueFrom) > 0 {
-			path = append(path, valueFrom...)
-		}
-	}
-
-	labelsFromPath := map[string][]string{}
-	for k, v := range i.LabelsFromPath {
-		path := []string{}
-		var err error
-		if v != "." {
-			path, err = v.Parse()
-			if err != nil {
-				klog.Fatal(err)
-			}
-		}
-		labelsFromPath[k] = path
-	}
-
 	return &customresourcestate.Generator{
 		Name: i.Name,
 		Help: i.Help,
 		Each: customresourcestate.Metric{
 			Type: customresourcestate.MetricTypeInfo,
 			Info: &customresourcestate.MetricInfo{
-				MetricMeta: customresourcestate.MetricMeta{
-					Path:           path,
-					LabelsFromPath: labelsFromPath,
-				},
+				MetricMeta:   newMetricMeta(basePath, i.JSONPath, i.LabelsFromPath),
 				LabelFromKey: i.LabelFromKey,
 			},
 		},

exp/metric-gen/markers/metric_stateset.go

@@ -61,8 +61,6 @@ func (stateSetMarker) help() *markers.DefinitionHelp {
 }
 
 func (s stateSetMarker) ToGenerator(basePath ...string) *customresourcestate.Generator {
-	path := basePath
-
 	var valueFrom []string
 	var err error
 	if s.JSONPath != nil {
@@ -87,13 +85,10 @@ func (s stateSetMarker) ToGenerator(basePath ...string) *customresourcestate.Gen
 		Each: customresourcestate.Metric{
 			Type: customresourcestate.MetricTypeStateSet,
 			StateSet: &customresourcestate.MetricStateSet{
-				MetricMeta: customresourcestate.MetricMeta{
-					Path:           path,
-					LabelsFromPath: labelsFromPath,
-				},
-				List:      s.List,
-				LabelName: s.LabelName,
-				ValueFrom: valueFrom,
+				MetricMeta: newMetricMeta(basePath, "", s.LabelsFromPath),
+				List:       s.List,
+				LabelName:  s.LabelName,
+				ValueFrom:  valueFrom,
 			},
 		},
 	}