PMM-14431 Reduce complexity.

Author: JiriCtvrtka

exporter/metrics.go

@@ -412,38 +412,44 @@ func handleMetric(reservedNames []string, prefix, nextPrefix, k string, val inte
 	case []interface{}:
 		// skip
 	default:
-		rm, err := makeRawMetric(reservedNames, prefix, k, v, l)
-		if err != nil {
-			invalidMetric := prometheus.NewInvalidMetric(prometheus.NewInvalidDesc(err), err)
-			res = append(res, invalidMetric)
-			return res
-		}
+		res = append(res, handleRawMetric(reservedNames, prefix, k, v, l, compatibleMode)...)
+	}
+	return res
+}
 
-		// makeRawMetric returns a nil metric for some data types like strings
-		// because we cannot extract data from all types
-		if rm == nil {
-			return res
-		}
+func handleRawMetric(reservedNames []string, prefix, k string, v interface{}, l map[string]string, compatibleMode bool) []prometheus.Metric {
+	var res []prometheus.Metric
+	rm, err := makeRawMetric(reservedNames, prefix, k, v, l)
+	if err != nil {
+		invalidMetric := prometheus.NewInvalidMetric(prometheus.NewInvalidDesc(err), err)
+		res = append(res, invalidMetric)
+		return res
+	}
 
-		metrics := []*rawMetric{rm}
+	// makeRawMetric returns a nil metric for some data types like strings
+	// because we cannot extract data from all types
+	if rm == nil {
+		return res
+	}
 
-		if renamedMetrics := metricRenameAndLabel(rm, specialConversions); renamedMetrics != nil {
-			metrics = renamedMetrics
-		}
+	metrics := []*rawMetric{rm}
 
-		for _, m := range metrics {
-			metric, err := rawToPrometheusMetric(m)
-			if err != nil {
-				invalidMetric := prometheus.NewInvalidMetric(prometheus.NewInvalidDesc(err), err)
-				res = append(res, invalidMetric)
-				continue
-			}
+	if renamedMetrics := metricRenameAndLabel(rm, specialConversions); renamedMetrics != nil {
+		metrics = renamedMetrics
+	}
 
-			res = append(res, metric)
+	for _, m := range metrics {
+		metric, err := rawToPrometheusMetric(m)
+		if err != nil {
+			invalidMetric := prometheus.NewInvalidMetric(prometheus.NewInvalidDesc(err), err)
+			res = append(res, invalidMetric)
+			continue
+		}
 
-			if compatibleMode {
-				res = appendCompatibleMetric(res, m)
-			}
+		res = append(res, metric)
+
+		if compatibleMode {
+			res = appendCompatibleMetric(res, m)
 		}
 	}
 	return res