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

Remove the confusing package-level variable #2152

Merged
merged 1 commit into from
Nov 20, 2020
+1 −3
Merged

Remove the confusing package-level variable #2152

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions receiver/prometheusreceiver/internal/metricsbuilder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@ var (
errNoDataToBuild = errors.New("there's no data to build")
errNoBoundaryLabel = errors.New("given metricType has no BucketLabel or QuantileLabel")
errEmptyBoundaryLabel = errors.New("BucketLabel or QuantileLabel is empty")

dummyMetrics = make([]*metricspb.Metric, 0)
)

type metricBuilder struct {
Expand Down Expand Up @@ -140,7 +138,7 @@ func (b *metricBuilder) AddDataPoint(ls labels.Labels, t int64, v float64) error
func (b *metricBuilder) Build() ([]*metricspb.Metric, int, int, error) {
if !b.hasData {
if b.hasInternalMetric {
return dummyMetrics, 0, 0, nil
return make([]*metricspb.Metric, 0), 0, 0, nil
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can this return nil instead of a slice with len 0?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not familiar enough with the semantics enough here to be confident returning nil and/or an error will be correct behavior. Leaving a TODO.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see the todo, did you forget to push the commit?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will do it.

}
return nil, 0, 0, errNoDataToBuild
}
Expand Down