From 58d38c4c5630fb73afb5403d03ede884ad7fd91c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Gouteroux?= <francois.gouteroux@gmail.com>
Date: Tue, 27 Jun 2023 09:30:39 +0200
Subject: [PATCH] fix: apply suggested changes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: François Gouteroux <francois.gouteroux@gmail.com>
---
 cmd/promtool/metrics.go     |  2 +-
 util/fmtutil/format.go      | 33 ++++++++++++---------------------
 util/fmtutil/format_test.go | 10 +++++-----
 3 files changed, 18 insertions(+), 27 deletions(-)

diff --git a/cmd/promtool/metrics.go b/cmd/promtool/metrics.go
index 4a6fafd40..2bc2237e2 100644
--- a/cmd/promtool/metrics.go
+++ b/cmd/promtool/metrics.go
@@ -102,7 +102,7 @@ func PushMetrics(url *url.URL, roundTripper http.RoundTripper, headers map[strin
 }
 
 func parseAndPushMetrics(client *remote.Client, data []byte, labels map[string]string) bool {
-	metricsData, err := fmtutil.ParseMetricsTextAndFormat(bytes.NewReader(data), labels)
+	metricsData, err := fmtutil.MetricTextToWriteRequest(bytes.NewReader(data), labels)
 	if err != nil {
 		fmt.Fprintln(os.Stderr, "  FAILED:", err)
 		return false
diff --git a/util/fmtutil/format.go b/util/fmtutil/format.go
index 5cff0516b..9034a90fa 100644
--- a/util/fmtutil/format.go
+++ b/util/fmtutil/format.go
@@ -44,8 +44,18 @@ var MetricMetadataTypeValue = map[string]int32{
 	"STATESET":       7,
 }
 
-// CreateWriteRequest convert metric family to a writerequest.
-func CreateWriteRequest(mf map[string]*dto.MetricFamily, extraLabels map[string]string) (*prompb.WriteRequest, error) {
+// MetricTextToWriteRequest consumes an io.Reader and return the data in write request format.
+func MetricTextToWriteRequest(input io.Reader, labels map[string]string) (*prompb.WriteRequest, error) {
+	var parser expfmt.TextParser
+	mf, err := parser.TextToMetricFamilies(input)
+	if err != nil {
+		return nil, err
+	}
+	return MetricFamiliesToWriteRequest(mf, labels)
+}
+
+// MetricFamiliesToWriteRequest convert metric family to a writerequest.
+func MetricFamiliesToWriteRequest(mf map[string]*dto.MetricFamily, extraLabels map[string]string) (*prompb.WriteRequest, error) {
 	wr := &prompb.WriteRequest{}
 
 	// build metric list
@@ -191,22 +201,3 @@ func makeLabelsMap(m *dto.Metric, metricName string, extraLabels map[string]stri
 
 	return labels
 }
-
-// ParseMetricsTextReader consumes an io.Reader and returns the MetricFamily.
-func ParseMetricsTextReader(input io.Reader) (map[string]*dto.MetricFamily, error) {
-	var parser expfmt.TextParser
-	mf, err := parser.TextToMetricFamilies(input)
-	if err != nil {
-		return nil, err
-	}
-	return mf, nil
-}
-
-// ParseMetricsTextAndFormat return the data in the expected prometheus metrics write request format.
-func ParseMetricsTextAndFormat(input io.Reader, labels map[string]string) (*prompb.WriteRequest, error) {
-	mf, err := ParseMetricsTextReader(input)
-	if err != nil {
-		return nil, err
-	}
-	return CreateWriteRequest(mf, labels)
-}
diff --git a/util/fmtutil/format_test.go b/util/fmtutil/format_test.go
index 5c1ab5bde..0f052f5e7 100644
--- a/util/fmtutil/format_test.go
+++ b/util/fmtutil/format_test.go
@@ -201,13 +201,13 @@ func TestParseAndPushMetricsTextAndFormat(t *testing.T) {
 	`))
 	labels := map[string]string{"job": "promtool"}
 
-	expected, err := ParseMetricsTextAndFormat(input, labels)
+	expected, err := MetricTextToWriteRequest(input, labels)
 	require.NoError(t, err)
 
 	require.Equal(t, writeRequestFixture, expected)
 }
 
-func TestParseMetricsTextAndFormatErrorParsingFloatValue(t *testing.T) {
+func TestMetricTextToWriteRequestErrorParsingFloatValue(t *testing.T) {
 	input := bytes.NewReader([]byte(`
 	# HELP http_requests_total The total number of HTTP requests.
 	# TYPE http_requests_total counter
@@ -216,11 +216,11 @@ func TestParseMetricsTextAndFormatErrorParsingFloatValue(t *testing.T) {
 	`))
 	labels := map[string]string{"job": "promtool"}
 
-	_, err := ParseMetricsTextAndFormat(input, labels)
+	_, err := MetricTextToWriteRequest(input, labels)
 	require.Equal(t, err.Error(), "text format parsing error in line 4: expected float as value, got \"1027Error\"")
 }
 
-func TestParseMetricsTextAndFormatErrorParsingMetricType(t *testing.T) {
+func TestMetricTextToWriteRequestErrorParsingMetricType(t *testing.T) {
 	input := bytes.NewReader([]byte(`
 	# HELP node_info node info summary.
 	# TYPE node_info info
@@ -228,6 +228,6 @@ func TestParseMetricsTextAndFormatErrorParsingMetricType(t *testing.T) {
 	`))
 	labels := map[string]string{"job": "promtool"}
 
-	_, err := ParseMetricsTextAndFormat(input, labels)
+	_, err := MetricTextToWriteRequest(input, labels)
 	require.Equal(t, err.Error(), "text format parsing error in line 3: unknown metric type \"info\"")
 }