Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Convert prometheusreceiver to new Number metrics #3716

Merged
merged 1 commit into from
Jul 26, 2021
Merged

Convert prometheusreceiver to new Number metrics #3716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions receiver/prometheusreceiver/internal/otlp_metricfamily.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
}
Expand Down
26 changes: 13 additions & 13 deletions receiver/prometheusreceiver/internal/otlp_metricsbuilder_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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,
},
Expand All @@ -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,
Expand All @@ -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,
},
Expand All @@ -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,
},
Expand Down