Convert prometheusreceiver to new Number metrics (open-telemetry#3716)

Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com>
emaderer · Jul 30, 2021 · cb61d18 · cb61d18
1 parent 331e483
commit cb61d18
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 15 deletions.
diff --git a/receiver/prometheusreceiver/internal/otlp_metricfamily.go b/receiver/prometheusreceiver/internal/otlp_metricfamily.go
@@ -185,7 +185,7 @@ func (mg *metricGroupPdata) toNumberDataPoint(orderedLabelKeys []string, dest *p
 	point := dest.AppendEmpty()
 	point.SetStartTimestamp(startTsNanos)
 	point.SetTimestamp(tsNanos)
-	point.SetValue(mg.value)
+	point.SetDoubleVal(mg.value)
 	populateLabelValuesPdata(orderedLabelKeys, mg.ls, point.LabelsMap())
 
 	return true
@@ -203,7 +203,6 @@ var _ = (*metricFamilyPdata)(nil).updateLabelKeys
 
 func (mf *metricFamilyPdata) isCumulativeTypePdata() bool {
 	return mf.mtype == pdata.MetricDataTypeSum ||
-		mf.mtype == pdata.MetricDataTypeIntSum ||
 		mf.mtype == pdata.MetricDataTypeHistogram ||
 		mf.mtype == pdata.MetricDataTypeSummary
 }

diff --git a/receiver/prometheusreceiver/internal/otlp_metricsbuilder_test.go b/receiver/prometheusreceiver/internal/otlp_metricsbuilder_test.go
@@ -237,7 +237,7 @@ func TestConvToPdataMetricType(t *testing.T) {
 	}
 }
 
-func TestIsusefulLabelPdata(t *testing.T) {
+func TestIsUsefulLabelPdata(t *testing.T) {
 	tests := []struct {
 		name      string
 		mtypes    []pdata.MetricDataType
@@ -254,10 +254,10 @@ func TestIsusefulLabelPdata(t *testing.T) {
 				pdata.MetricDataTypeGauge,
 				pdata.MetricDataTypeHistogram,
 				pdata.MetricDataTypeSummary,
-				pdata.MetricDataTypeIntSum,
+				pdata.MetricDataTypeSum,
 				pdata.MetricDataTypeNone,
-				pdata.MetricDataTypeIntGauge,
-				pdata.MetricDataTypeIntSum,
+				pdata.MetricDataTypeGauge,
+				pdata.MetricDataTypeSum,
 			},
 			want: false,
 		},
@@ -267,10 +267,10 @@ func TestIsusefulLabelPdata(t *testing.T) {
 				pdata.MetricDataTypeSum,
 				pdata.MetricDataTypeGauge,
 				pdata.MetricDataTypeSummary,
-				pdata.MetricDataTypeIntSum,
+				pdata.MetricDataTypeSum,
 				pdata.MetricDataTypeNone,
-				pdata.MetricDataTypeIntGauge,
-				pdata.MetricDataTypeIntSum,
+				pdata.MetricDataTypeGauge,
+				pdata.MetricDataTypeSum,
 			},
 			labelKeys: []string{model.BucketLabel},
 			want:      true,
@@ -290,10 +290,10 @@ func TestIsusefulLabelPdata(t *testing.T) {
 				pdata.MetricDataTypeSum,
 				pdata.MetricDataTypeGauge,
 				pdata.MetricDataTypeHistogram,
-				pdata.MetricDataTypeIntSum,
+				pdata.MetricDataTypeSum,
 				pdata.MetricDataTypeNone,
-				pdata.MetricDataTypeIntGauge,
-				pdata.MetricDataTypeIntSum,
+				pdata.MetricDataTypeGauge,
+				pdata.MetricDataTypeSum,
 			},
 			want: true,
 		},
@@ -305,10 +305,10 @@ func TestIsusefulLabelPdata(t *testing.T) {
 				pdata.MetricDataTypeGauge,
 				pdata.MetricDataTypeHistogram,
 				pdata.MetricDataTypeSummary,
-				pdata.MetricDataTypeIntSum,
+				pdata.MetricDataTypeSum,
 				pdata.MetricDataTypeNone,
-				pdata.MetricDataTypeIntGauge,
-				pdata.MetricDataTypeIntSum,
+				pdata.MetricDataTypeGauge,
+				pdata.MetricDataTypeSum,
 			},
 			want: true,
 		},