From bd70811e269d21521b00196315b705f0de441576 Mon Sep 17 00:00:00 2001
From: Catherine Fang <yinghongfang@google.com>
Date: Thu, 20 Oct 2022 10:52:48 -0400
Subject: [PATCH] refactoring

---
 tests/e2e.sh               |  1 -
 tests/stable/check_test.go | 54 ++++++++++++++++++--------------------
 2 files changed, 25 insertions(+), 30 deletions(-)

diff --git a/tests/e2e.sh b/tests/e2e.sh
index 3703caa94b..1284f2bc3e 100755
--- a/tests/e2e.sh
+++ b/tests/e2e.sh
@@ -15,7 +15,6 @@
 # limitations under the License.
 
 set -e
-set -x
 set -o pipefail
 
 case $(uname -m) in
diff --git a/tests/stable/check_test.go b/tests/stable/check_test.go
index 222e351def..1a415db33e 100644
--- a/tests/stable/check_test.go
+++ b/tests/stable/check_test.go
@@ -22,16 +22,15 @@ import (
 	"sort"
 	"testing"
 
-	"log"
 	"os"
 	"strings"
 
 	"github.com/google/go-cmp/cmp"
+	"github.com/google/go-cmp/cmp/cmpopts"
 	prommodel "github.com/prometheus/client_model/go"
 	"github.com/prometheus/common/expfmt"
 	"gopkg.in/yaml.v3"
-
-	"github.com/google/go-cmp/cmp/cmpopts"
+	"k8s.io/klog/v2"
 )
 
 var promText string
@@ -57,7 +56,9 @@ func TestMain(m *testing.M) {
 
 func TestStableMetrics(t *testing.T) {
 	mf, err := parsePromText(promText)
-	fatal(err)
+	if err != nil {
+		t.Fatalf("Can't parse collected prometheus metrics text. err = %v", err)
+	}
 	collectedStableMetrics := extractStableMetrics(mf)
 	printMetric(collectedStableMetrics)
 
@@ -70,25 +71,18 @@ func TestStableMetrics(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Stable metrics changed: err = %v", err)
 	} else {
-		fmt.Println("passed")
-	}
-
-}
-
-func fatal(err error) {
-	if err != nil {
-		log.Fatalln(err)
+		klog.Infoln("Passed")
 	}
 }
 
 func printMetric(metrics []Metric) {
 	yamlData, err := yaml.Marshal(metrics)
 	if err != nil {
-		fmt.Printf("error while Marshaling. %v", err)
+		klog.Errorf("error while Marshaling. %v", err)
 	}
-	fmt.Println("---begin YAML file---")
-	fmt.Println(string(yamlData))
-	fmt.Println("---end YAML file---")
+	klog.Infoln("---begin YAML file---")
+	klog.Infoln(string(yamlData))
+	klog.Infoln("---end YAML file---")
 }
 
 func parsePromText(path string) (map[string]*prommodel.MetricFamily, error) {
@@ -116,6 +110,14 @@ func getBuckets(v *prommodel.MetricFamily) []float64 {
 	return buckets
 }
 
+func getLabels(m *prommodel.Metric) []string {
+	labels := []string{}
+	for _, y := range m.Label {
+		labels = append(labels, y.GetName())
+	}
+	return labels
+}
+
 func extractStableMetrics(mf map[string]*prommodel.MetricFamily) []Metric {
 	metrics := []Metric{}
 	for _, v := range mf {
@@ -123,19 +125,13 @@ func extractStableMetrics(mf map[string]*prommodel.MetricFamily) []Metric {
 		if !strings.Contains(*(v.Help), "[STABLE]") {
 			continue
 		}
-
-		m := Metric{
+		metrics = append(metrics, Metric{
 			Name:    *(v.Name),
 			Help:    *(v.Help),
 			Type:    (v.Type).String(),
 			Buckets: getBuckets(v),
-		}
-		labels := []string{}
-		for _, y := range v.Metric[0].Label {
-			labels = append(labels, y.GetName())
-		}
-		m.Labels = labels
-		metrics = append(metrics, m)
+			Labels:  getLabels(v.Metric[0]),
+		})
 	}
 	return metrics
 }
@@ -153,11 +149,11 @@ func readYaml(filename string) (*[]Metric, error) {
 	return c, err
 }
 
-func convert2Map(metrics []Metric, skipMap map[string]int) map[string]Metric {
+func convertToMap(metrics []Metric, skipMap map[string]int) map[string]Metric {
 	name2Metric := map[string]Metric{}
 	for _, v := range metrics {
 		if _, ok := skipMap[v.Name]; ok {
-			fmt.Printf("skip, metric %s is in skip list\n", v.Name)
+			klog.Infof("skip, metric %s is in skip list\n", v.Name)
 			continue
 		}
 		name2Metric[v.Name] = v
@@ -180,8 +176,8 @@ func compare(collectedStableMetrics []Metric, expectedStableMetrics []Metric, sk
 	for _, v := range skipStableMetrics {
 		skipMap[v] = 1
 	}
-	collected := convert2Map(collectedStableMetrics, skipMap)
-	expected := convert2Map(expectedStableMetrics, skipMap)
+	collected := convertToMap(collectedStableMetrics, skipMap)
+	expected := convertToMap(expectedStableMetrics, skipMap)
 
 	var ok bool