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

Return an error instead of nil when parseline gets nil/empty input #5

Closed
wants to merge 1 commit into from
Closed

Return an error instead of nil when parseline gets nil/empty input #5

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion statsd/receiver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package statsd

import (
"bytes"
"errors"
"fmt"
"io"
"net"
Expand Down Expand Up @@ -188,10 +189,15 @@ func (mr *metricReceiver) getAdditionalTags(addr string) types.Tags {

// ParseLine with lexer impl.
func (mr *metricReceiver) parseLine(line []byte) (*types.Metric, error) {
if line == nil {
return nil, errors.New("Error parsing line. Byte array is nil")
}
Copy link
Contributor

Choose a reason for hiding this comment

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

I don't think this check is necessary, is it?


llen := len(line)
if llen == 0 {
return nil, nil
return nil, errors.New("Error parsing line. Byte array is empty")
Copy link
Contributor

Choose a reason for hiding this comment

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

I don't think it is possible to hit this branch in the current codebase - there is a check before this function is invoked:

if len(line) > 1 {
    metric, err := mr.parseLine(line)

I agree the code is not ideal (a redundant check inside of the function) and I've cleanup it up already in another branch.

}

metric := &types.Metric{}
metric.Tags = append(metric.Tags, mr.tags...)
l := &lexer{input: line, len: llen, m: metric, namespace: mr.namespace}
Expand Down
11 changes: 11 additions & 0 deletions statsd/receiver_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,17 @@ func TestParseLine(t *testing.T) {
}

mr := &metricReceiver{}

_, err := mr.parseLine([]byte{})
if err == nil {
t.Errorf("Attempting to parse empty byte slice and did not get error back")
}

_, err = mr.parseLine(nil)
if err == nil {
t.Errorf("Attempting to parse nil slice and did not get error back")
}

compare(tests, mr, t)

failing := []string{"fOO|bar:bazkk", "foo.bar.baz:1|q", "NaN.should.be:NaN|g"}
Expand Down