make cortex_test readable

open-o11y · Aug 4, 2020 · 96807eb · 96807eb
1 parent 53fbe2b
commit 96807eb
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 23 deletions.
diff --git a/exporter/cortexexporter/cortex.go b/exporter/cortexexporter/cortex.go
@@ -263,6 +263,7 @@ func newCortexExporter(ns string, ep string, client *http.Client) *cortexExporte
 		closeChan:  make(chan struct{}),
 	}
 }
+
 // shutdown stops the exporter from accepting incoming calls(and return error), and wait for current export operations
 // to finish before returning
 func (ce *cortexExporter)shutdown(context.Context) error{
@@ -316,7 +317,7 @@ func (ce *cortexExporter) pushMetrics(ctx context.Context, md pdata.Metrics) (in
 			return dropped, fmt.Errorf(strings.Join(errStrings, "\n"))
 		}
 
-		if err := ce.Export(ctx,tsMap); err != nil {
+		if err := ce.export(ctx,tsMap); err != nil {
 			return pdatautil.MetricCount(md), err
 		}
 

diff --git a/exporter/cortexexporter/cortex_test.go b/exporter/cortexexporter/cortex_test.go
@@ -160,19 +160,19 @@ func Test_timeSeriesSignature(t *testing.T) {
 			"int64_signature",
 			promLbs1,
 			otlp.MetricDescriptor_INT64,
-			typeInt64 + "-" + label11 + "-" + value11 + "-" + label12 + "-" + value12,
+			typeInt64 + lb1Sig,
 		},
 		{
 			"histogram_signature",
 			promLbs2,
 			otlp.MetricDescriptor_HISTOGRAM,
-			typeHistogram + "-" + label21 + "-" + value21 + "-" + label22 + "-" + value22,
+			typeHistogram + lb2Sig,
 		},
 		{
 			"unordered_signature",
 			getPromLabels(label22, value22, label21, value21),
 			otlp.MetricDescriptor_HISTOGRAM,
-			typeHistogram + "-" + label21 + "-" + value21 + "-" + label22 + "-" + value22,
+			typeHistogram + lb2Sig,
 		},
 		// descriptor type cannot be nil, as checked by validateMetrics
 		{
@@ -235,14 +235,14 @@ func Test_createLabelSet(t *testing.T) {
 
 func Test_handleScalarMetric(t *testing.T) {
 	sameTs := map[string]*prompb.TimeSeries{
-		typeMonotonicInt64 + "-name-same_ts_int_points_total" + "-" + label11 + "-" + value11 + "-" + label12 + "-" + value12: getTimeSeries(getPromLabels(label11, value11, label12, value12, "name", "same_ts_int_points_total"),
+		typeMonotonicInt64 + "-name-same_ts_int_points_total" + lb1Sig: getTimeSeries(getPromLabels(label11, value11, label12, value12, "name", "same_ts_int_points_total"),
 			getSample(float64(intVal1), time1),
 			getSample(float64(intVal2), time1)),
 	}
 	differentTs := map[string]*prompb.TimeSeries{
-		typeMonotonicInt64 + "-name-different_ts_int_points_total" + "-" + label11 + "-" + value11 + "-" + label12 + "-" + value12: getTimeSeries(getPromLabels(label11, value11, label12, value12, "name", "different_ts_int_points_total"),
+		typeMonotonicInt64 + "-name-different_ts_int_points_total" + lb1Sig: getTimeSeries(getPromLabels(label11, value11, label12, value12, "name", "different_ts_int_points_total"),
 			getSample(float64(intVal1), time1)),
-		typeMonotonicInt64 + "-name-different_ts_int_points_total" + "-" + label21 + "-" + value21 + "-" + label22 + "-" + value22: getTimeSeries(getPromLabels(label21, value21, label22, value22, "name", "different_ts_int_points_total"),
+		typeMonotonicInt64 + "-name-different_ts_int_points_total" + lb2Sig: getTimeSeries(getPromLabels(label21, value21, label22, value22, "name", "different_ts_int_points_total"),
 			getSample(float64(intVal1), time2)),
 	}
 	tests := []struct {
@@ -340,14 +340,14 @@ func Test_handleHistogramMetric(t *testing.T) {
 		},
 	}
 	sigs := map[string]string{
-		sum:   typeHistogram + "-name-valid_single_int_point_sum-" + label11 + "-" + value11 + "-" + label12 + "-" + value12,
-		count: typeHistogram + "-name-valid_single_int_point_count-" + label11 + "-" + value11 + "-" + label12 + "-" + value12,
+		sum:   typeHistogram + "-name-valid_single_int_point_sum" + lb1Sig,
+		count: typeHistogram + "-name-valid_single_int_point_count" + lb1Sig,
 		bucket1: typeHistogram + "-" + "le-" + strconv.FormatFloat(floatVal1, 'f', -1, 64) +
-			"-name-valid_single_int_point_bucket-" + label11 + "-" + value11 + "-" + label12 + "-" + value12,
+			"-name-valid_single_int_point_bucket" + lb1Sig,
 		bucket2: typeHistogram + "-" + "le-" + strconv.FormatFloat(floatVal2, 'f', -1, 64) +
-			"-name-valid_single_int_point_bucket-" + label11 + "-" + value11 + "-" + label12 + "-" + value12,
+			"-name-valid_single_int_point_bucket" + lb1Sig,
 		bucketInf: typeHistogram + "-" + "le-" + "+Inf" +
-			"-name-valid_single_int_point_bucket-" + label11 + "-" + value11 + "-" + label12 + "-" + value12,
+			"-name-valid_single_int_point_bucket" + lb1Sig,
 	}
 	lbls := map[string][]prompb.Label{
 		sum:   append(promLbs1, getPromLabels("name", "valid_single_int_point_sum")...),
@@ -422,12 +422,12 @@ func Test_handleSummaryMetric(t *testing.T) {
 	q1 := "quantile1"
 	q2 := "quantile2"
 	sigs := map[string]string{
-		sum:   typeSummary + "-name-valid_single_int_point_sum-" + label11 + "-" + value11 + "-" + label12 + "-" + value12,
-		count: typeSummary + "-name-valid_single_int_point_count-" + label11 + "-" + value11 + "-" + label12 + "-" + value12,
+		sum:   typeSummary + "-name-valid_single_int_point_sum" + lb1Sig,
+		count: typeSummary + "-name-valid_single_int_point_count" + lb1Sig,
 		q1: typeSummary + "-name-valid_single_int_point-" + "quantile-" + strconv.FormatFloat(floatVal1, 'f', -1, 64) +
-			"-" + label11 + "-" + value11 + "-" + label12 + "-" + value12,
+			lb1Sig,
 		q2: typeSummary + "-name-valid_single_int_point-" + "quantile-" + strconv.FormatFloat(floatVal2, 'f', -1, 64) +
-			"-" + label11 + "-" + value11 + "-" + label12 + "-" + value12,
+			lb1Sig,
 	}
 	lbls := map[string][]prompb.Label{
 		sum:   append(promLbs1, getPromLabels("name", "valid_single_int_point_sum")...),
@@ -551,7 +551,6 @@ func Test_Export(t *testing.T) {
 	return
 }
 
-
 func Test_newCortexExporter(t *testing.T) {
 	config  := &Config{
 		ExporterSettings:   configmodels.ExporterSettings{},
@@ -570,7 +569,7 @@ func Test_newCortexExporter(t *testing.T) {
 	assert.NotNil(t, ce.closeChan)
 	assert.NotNil(t, ce.wg)
 }
-
+// Bug{@huyan0} success case pass but it should fail
 // test the correctness and the number of points
 func Test_pushMetrics(t *testing.T) {
 	noTempBatch := pdatautil.MetricsFromInternalMetrics(testdata.GenerateMetricDataManyMetricsSameResource(10))

diff --git a/exporter/cortexexporter/testutil.go b/exporter/cortexexporter/testutil.go
@@ -38,6 +38,11 @@ var (
 	dirty1 = "%"
 	dirty2 = "?"
 
+	intVal1 int64 = 1
+	intVal2  int64= 2
+	floatVal1 = 1.0
+	floatVal2 = 2.0
+
 	lbs1 = getLabels(label11, value11, label12, value12)
 	lbs2 = getLabels(label21, value21, label22, value22)
 	lbs1Dirty = getLabels(label11+dirty1, value11, dirty2+label12, value12)
@@ -47,11 +52,8 @@ var (
 	promLbs2 = getPromLabels(label21, value21, label22, value22)
 	promLbs3 = getPromLabels(label31, value31, label32, value32)
 
-	intVal1 int64 = 1
-	intVal2  int64= 2
-    floatVal1 = 1.0
-    floatVal2 = 2.0
-
+	lb1Sig = "-" + label11 + "-" + value11 + "-" + label12 + "-" + value12
+	lb2Sig = "-" + label21 + "-" + value21 + "-" + label22 + "-" + value22
 	int64Cumulative = 9
 	monotonicInt64 = 0
 	histogram = 2