refactor

Author: Trojan295

internal/castai/client.go

@@ -198,11 +198,6 @@ func convertPrometheusMetricFamilies(gatherTime time.Time, podName string, metri
 	timeseries := []PrometheusTimeseries{}
 	for _, family := range metricFamilies {
 		for _, metric := range family.Metric {
-			// Right now we support only export of counter and histogram metrics.
-			if metric.Counter == nil && metric.Histogram == nil && metric.Summary == nil {
-				continue
-			}
-
 			commonLabels := []PrometheusLabel{
 				{
 					Name:  "pod_name",
@@ -222,104 +217,19 @@ func convertPrometheusMetricFamilies(gatherTime time.Time, podName string, metri
 			}
 
 			if metric.Counter != nil {
-				timeseries = append(timeseries, PrometheusTimeseries{
-					Labels: copyLabelsWithName(commonLabels, family.GetName()),
-					Samples: []PrometheusSample{
-						{
-							Timestamp: timestamp,
-							Value:     metric.Counter.GetValue(),
-						},
-					},
-				})
+				timeseries = append(timeseries,
+					convertPrometheusCounterMetric(commonLabels, family, metric, timestamp)...,
+				)
 			}
 
 			if metric.Histogram != nil {
-				h := metric.Histogram
-
-				for _, b := range h.Bucket {
-					timeseries = append(timeseries, PrometheusTimeseries{
-						Labels: copyLabelsWithName(commonLabels, family.GetName()+"_bucket", PrometheusLabel{
-							Name: "le", Value: fmt.Sprintf("%f", b.GetUpperBound()),
-						}),
-						Samples: []PrometheusSample{
-							{
-								Timestamp: timestamp,
-								Value:     float64(b.GetCumulativeCount()),
-							},
-						},
-					})
-				}
-				// We need this +Inf bucket for histogram_quantile query.
-				timeseries = append(timeseries, PrometheusTimeseries{
-					Labels: copyLabelsWithName(commonLabels, family.GetName()+"_bucket", PrometheusLabel{
-						Name: "le", Value: "+Inf",
-					}),
-					Samples: []PrometheusSample{
-						{
-							Timestamp: timestamp,
-							Value:     float64(h.GetSampleCount()),
-						},
-					},
-				})
-
-				timeseries = append(timeseries, PrometheusTimeseries{
-					Labels: copyLabelsWithName(commonLabels, family.GetName()+"_sum"),
-					Samples: []PrometheusSample{
-						{
-							Timestamp: timestamp,
-							Value:     h.GetSampleSum(),
-						},
-					},
-				})
-
-				timeseries = append(timeseries, PrometheusTimeseries{
-					Labels: copyLabelsWithName(commonLabels, family.GetName()+"_count"),
-					Samples: []PrometheusSample{
-						{
-							Timestamp: timestamp,
-							Value:     float64(h.GetSampleCount()),
-						},
-					},
-				})
+				timeseries = append(timeseries,
+					convertPrometheusHistogramMetric(commonLabels, family, metric, timestamp)...)
 			}
 
 			if metric.Summary != nil {
-				s := metric.Summary
-
-				for _, quantile := range s.Quantile {
-					timeseries = append(timeseries, PrometheusTimeseries{
-						Labels: copyLabelsWithName(commonLabels, family.GetName()+"_quantile", PrometheusLabel{
-							Name:  "quantile",
-							Value: fmt.Sprintf("%f", quantile.GetQuantile()),
-						}),
-						Samples: []PrometheusSample{
-							{
-								Timestamp: timestamp,
-								Value:     quantile.GetValue(),
-							},
-						},
-					})
-				}
-
-				timeseries = append(timeseries, PrometheusTimeseries{
-					Labels: copyLabelsWithName(commonLabels, family.GetName()+"_sum"),
-					Samples: []PrometheusSample{
-						{
-							Timestamp: timestamp,
-							Value:     s.GetSampleSum(),
-						},
-					},
-				})
-
-				timeseries = append(timeseries, PrometheusTimeseries{
-					Labels: copyLabelsWithName(commonLabels, family.GetName()+"_count"),
-					Samples: []PrometheusSample{
-						{
-							Timestamp: timestamp,
-							Value:     float64(s.GetSampleCount()),
-						},
-					},
-				})
+				timeseries = append(timeseries,
+					convertPrometheusSummaryMetric(commonLabels, family, metric, timestamp)...)
 			}
 		}
 	}
@@ -329,6 +239,129 @@ func convertPrometheusMetricFamilies(gatherTime time.Time, podName string, metri
 	}
 }
 
+func convertPrometheusCounterMetric(
+	commonLabels []PrometheusLabel,
+	family *dto.MetricFamily,
+	metric *dto.Metric,
+	timestamp int64,
+) []PrometheusTimeseries {
+	return []PrometheusTimeseries{
+		{
+			Labels: copyLabelsWithName(commonLabels, family.GetName()),
+			Samples: []PrometheusSample{
+				{
+					Timestamp: timestamp,
+					Value:     metric.Counter.GetValue(),
+				},
+			},
+		},
+	}
+}
+
+func convertPrometheusHistogramMetric(
+	commonLabels []PrometheusLabel,
+	family *dto.MetricFamily,
+	metric *dto.Metric,
+	timestamp int64,
+) []PrometheusTimeseries {
+	timeseries := make([]PrometheusTimeseries, 0)
+	h := metric.Histogram
+
+	for _, b := range h.Bucket {
+		timeseries = append(timeseries, PrometheusTimeseries{
+			Labels: copyLabelsWithName(commonLabels, family.GetName()+"_bucket", PrometheusLabel{
+				Name: "le", Value: fmt.Sprintf("%f", b.GetUpperBound()),
+			}),
+			Samples: []PrometheusSample{
+				{
+					Timestamp: timestamp,
+					Value:     float64(b.GetCumulativeCount()),
+				},
+			},
+		})
+	}
+	// We need this +Inf bucket for histogram_quantile query.
+	timeseries = append(timeseries, PrometheusTimeseries{
+		Labels: copyLabelsWithName(commonLabels, family.GetName()+"_bucket", PrometheusLabel{
+			Name: "le", Value: "+Inf",
+		}),
+		Samples: []PrometheusSample{
+			{
+				Timestamp: timestamp,
+				Value:     float64(h.GetSampleCount()),
+			},
+		},
+	})
+
+	timeseries = append(timeseries, PrometheusTimeseries{
+		Labels: copyLabelsWithName(commonLabels, family.GetName()+"_sum"),
+		Samples: []PrometheusSample{
+			{
+				Timestamp: timestamp,
+				Value:     h.GetSampleSum(),
+			},
+		},
+	})
+
+	timeseries = append(timeseries, PrometheusTimeseries{
+		Labels: copyLabelsWithName(commonLabels, family.GetName()+"_count"),
+		Samples: []PrometheusSample{
+			{
+				Timestamp: timestamp,
+				Value:     float64(h.GetSampleCount()),
+			},
+		},
+	})
+
+	return timeseries
+}
+
+func convertPrometheusSummaryMetric(
+	commonLabels []PrometheusLabel,
+	family *dto.MetricFamily,
+	metric *dto.Metric,
+	timestamp int64,
+) []PrometheusTimeseries {
+	timeseries := make([]PrometheusTimeseries, 0)
+	s := metric.Summary
+
+	for _, quantile := range s.Quantile {
+		timeseries = append(timeseries, PrometheusTimeseries{
+			Labels: copyLabelsWithName(commonLabels, family.GetName()+"_quantile", PrometheusLabel{
+				Name:  "quantile",
+				Value: fmt.Sprintf("%f", quantile.GetQuantile()),
+			}),
+			Samples: []PrometheusSample{
+				{
+					Timestamp: timestamp,
+					Value:     quantile.GetValue(),
+				},
+			},
+		})
+	}
+
+	timeseries = append(timeseries, PrometheusTimeseries{
+		Labels: copyLabelsWithName(commonLabels, family.GetName()+"_sum"),
+		Samples: []PrometheusSample{
+			{
+				Timestamp: timestamp,
+				Value:     s.GetSampleSum(),
+			},
+		},
+	})
+
+	timeseries = append(timeseries, PrometheusTimeseries{
+		Labels: copyLabelsWithName(commonLabels, family.GetName()+"_count"),
+		Samples: []PrometheusSample{
+			{
+				Timestamp: timestamp,
+				Value:     float64(s.GetSampleCount()),
+			},
+		},
+	})
+	return timeseries
+}
+
 func copyLabelsWithName(baseLabels []PrometheusLabel, name string, additionalLabels ...PrometheusLabel) []PrometheusLabel {
 	labels := make([]PrometheusLabel, 0, len(baseLabels)+1)
 	labels = append(labels, baseLabels...)