chore: fix lint and tests

exporter.go

@@ -41,8 +41,6 @@ const (
 )
 
 type rsyslogExporter struct {
-	started bool
-	logfile *os.File
 	scanner *bufio.Scanner
 	pointStore
 }
@@ -74,6 +72,7 @@ func (re *rsyslogExporter) handleStatLine(rawbuf []byte) error {
 			return err
 		}
 		for _, p := range a.toPoints() {
+			// nolint:errcheck
 			re.set(p)
 		}
 
@@ -83,6 +82,7 @@ func (re *rsyslogExporter) handleStatLine(rawbuf []byte) error {
 			return err
 		}
 		for _, p := range i.toPoints() {
+			// nolint:errcheck
 			re.set(p)
 		}
 
@@ -92,6 +92,7 @@ func (re *rsyslogExporter) handleStatLine(rawbuf []byte) error {
 			return err
 		}
 		for _, p := range u.toPoints() {
+			// nolint:errcheck
 			re.set(p)
 		}
 
@@ -101,6 +102,7 @@ func (re *rsyslogExporter) handleStatLine(rawbuf []byte) error {
 			return err
 		}
 		for _, p := range q.toPoints() {
+			// nolint:errcheck
 			re.set(p)
 		}
 
@@ -110,6 +112,7 @@ func (re *rsyslogExporter) handleStatLine(rawbuf []byte) error {
 			return err
 		}
 		for _, p := range r.toPoints() {
+			// nolint:errcheck
 			re.set(p)
 		}
 	case rsyslogDynStat:
@@ -118,6 +121,7 @@ func (re *rsyslogExporter) handleStatLine(rawbuf []byte) error {
 			return err
 		}
 		for _, p := range s.toPoints() {
+			// nolint:errcheck
 			re.set(p)
 		}
 	case rsyslogDynafileCache:
@@ -126,6 +130,7 @@ func (re *rsyslogExporter) handleStatLine(rawbuf []byte) error {
 			return err
 		}
 		for _, p := range d.toPoints() {
+			// nolint:errcheck
 			re.set(p)
 		}
 	case rsyslogForward:
@@ -134,6 +139,7 @@ func (re *rsyslogExporter) handleStatLine(rawbuf []byte) error {
 			return err
 		}
 		for _, p := range f.toPoints() {
+			// nolint:errcheck
 			re.set(p)
 		}
 	case rsyslogKubernetes:
@@ -142,6 +148,7 @@ func (re *rsyslogExporter) handleStatLine(rawbuf []byte) error {
 			return err
 		}
 		for _, p := range k.toPoints() {
+			// nolint:errcheck
 			re.set(p)
 		}
 	case rsyslogOmkafka:
@@ -150,6 +157,7 @@ func (re *rsyslogExporter) handleStatLine(rawbuf []byte) error {
 			return err
 		}
 		for _, p := range o.toPoints() {
+			// nolint:errcheck
 			re.set(p)
 		}
 
@@ -214,6 +222,7 @@ func (re *rsyslogExporter) run(silent bool) {
 		Type:        counter,
 		Description: "Counts errors during stats line handling",
 	}
+	// nolint:errcheck
 	re.set(errorPoint)
 	for re.scanner.Scan() {
 		err := re.handleStatLine(re.scanner.Bytes())

exporter_test.go

@@ -20,6 +20,7 @@ import (
 
 func testHelper(t *testing.T, line []byte, testCase []*testUnit) {
 	exporter := newRsyslogExporter()
+	// nolint:errcheck
 	exporter.handleStatLine(line)
 
 	for _, k := range exporter.keys() {
@@ -37,6 +38,7 @@ func testHelper(t *testing.T, line []byte, testCase []*testUnit) {
 		}
 	}
 
+	// nolint:errcheck
 	exporter.handleStatLine(line)
 
 	for _, item := range testCase {
@@ -275,6 +277,7 @@ func TestHandleUnknown(t *testing.T) {
 	unknownLog := []byte(`2017-08-30T08:10:04.786350+00:00 some-node.example.org rsyslogd-pstats: {"a":"b"}`)
 
 	exporter := newRsyslogExporter()
+	// nolint:errcheck
 	exporter.handleStatLine(unknownLog)
 
 	if want, got := 0, len(exporter.keys()); want != got {

input_imudp_test.go

@@ -19,13 +19,13 @@ var (
 	inputIMUDPLog = []byte(`{ "name": "test_input_imudp", "origin": "imudp", "called.recvmmsg":1000, "called.recvmsg":2000, "msgs.received":500}`)
 )
 
-func TestgetInputIMUDP(t *testing.T) {
+func TestGetInputIMUDP(t *testing.T) {
 	logType := getStatType(inputIMUDPLog)
 	if logType != rsyslogInputIMDUP {
 		t.Errorf("detected pstat type should be %d but is %d", rsyslogInputIMDUP, logType)
 	}
 
-	pstat, err := newInputIMUDPFromJSON([]byte(inputLog))
+	pstat, err := newInputIMUDPFromJSON([]byte(inputIMUDPLog))
 	if err != nil {
 		t.Fatalf("expected parsing input stat not to fail, got: %v", err)
 	}
@@ -34,11 +34,11 @@ func TestgetInputIMUDP(t *testing.T) {
 		t.Errorf("want '%s', got '%s'", want, got)
 	}
 
-	if want, got := int64(1000), pstat.Recvmsg; want != got {
+	if want, got := int64(1000), pstat.Recvmmsg; want != got {
 		t.Errorf("want '%d', got '%d'", want, got)
 	}
 
-	if want, got := int64(2000), pstat.Recvmmsg; want != got {
+	if want, got := int64(2000), pstat.Recvmsg; want != got {
 		t.Errorf("want '%d', got '%d'", want, got)
 	}
 

inputs_test.go

@@ -19,7 +19,7 @@ var (
 	inputLog = []byte(`{"name":"test_input", "origin":"imuxsock", "submitted":1000}`)
 )
 
-func TestgetInput(t *testing.T) {
+func TestGetInput(t *testing.T) {
 	logType := getStatType(inputLog)
 	if logType != rsyslogInput {
 		t.Errorf("detected pstat type should be %d but is %d", rsyslogInput, logType)

main.go

@@ -57,6 +57,7 @@ func main() {
 	prometheus.MustRegister(exporter)
 	http.Handle(*metricPath, promhttp.Handler())
 	http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
+		// nolint:errcheck
 		w.Write([]byte(`<html>
 <head><title>Rsyslog exporter</title></head>
 <body>

point_test.go

@@ -34,7 +34,7 @@ func TestCounter(t *testing.T) {
 		t.Errorf("want '%v', got '%v'", want, got)
 	}
 
-	wanted := `Desc{fqName: "rsyslog_my counter", help: "", constLabels: {}, variableLabels: []}`
+	wanted := `Desc{fqName: "rsyslog_my counter", help: "", constLabels: {}, variableLabels: {}}`
 	if want, got := wanted, p1.promDescription().String(); want != got {
 		t.Errorf("want '%s', got '%s'", want, got)
 	}
@@ -55,7 +55,7 @@ func TestGauge(t *testing.T) {
 		t.Errorf("want '%v', got '%v'", want, got)
 	}
 
-	wanted := `Desc{fqName: "rsyslog_my gauge", help: "", constLabels: {}, variableLabels: []}`
+	wanted := `Desc{fqName: "rsyslog_my gauge", help: "", constLabels: {}, variableLabels: {}}`
 	if want, got := wanted, p1.promDescription().String(); want != got {
 		t.Errorf("want '%s', got '%s'", want, got)
 	}

queues_test.go

@@ -71,12 +71,6 @@ func TestQueueToPoints(t *testing.T) {
 		t.Errorf("want '%s', got '%s'", want, got)
 	}
 
-	if want, got := int64(10), point.Value; want != got {
-	}
-
-	if want, got := gauge, point.Type; want != got {
-	}
-
 	if want, got := "main Q", point.LabelValue; want != got {
 		t.Errorf("wanted '%s', got '%s'", want, got)
 	}