diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cfad37b7..bf3f1b51 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -123,7 +123,7 @@ jobs: - name: Run golangci-lint uses: golangci/golangci-lint-action@v3 with: - version: v1.51.2 + version: v1.54.2 env: CGO_LDFLAGS: "-l bpf" diff --git a/.golangci.yaml b/.golangci.yaml index 149df67c..d8e9ea5e 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -1,6 +1,34 @@ linters: enable: + - dupl + - durationcheck + - exhaustive + - exportloopref + - forcetypeassert + - goimports + - gomoddirectives + - interfacebloat + - makezero + - mirror + - misspell + - musttag + - nestif + - nilnil + - nolintlint + - nosprintfhostport + - prealloc + - predeclared + - promlinter + - reassign - revive + - tagalign + - unconvert + - unparam + - unused + - usestdlibvars + - whitespace + # nilerr: https://github.com/gostaticanalysis/nilerr/issues/8 + # wastedassign: https://github.com/sanposhiho/wastedassign/issues/39 issues: exclude-use-default: false exclude: diff --git a/cmd/ebpf_exporter/main.go b/cmd/ebpf_exporter/main.go index 938918df..7ed3c85d 100644 --- a/cmd/ebpf_exporter/main.go +++ b/cmd/ebpf_exporter/main.go @@ -128,7 +128,6 @@ func listen(addr string) error { } return http.ListenAndServe(addr, nil) - } func ensureCapabilities(keep string) error { diff --git a/decoder/decoder_test.go b/decoder/decoder_test.go index db95a470..08a469f7 100644 --- a/decoder/decoder_test.go +++ b/decoder/decoder_test.go @@ -15,7 +15,7 @@ func TestDecodeLabels(t *testing.T) { err bool }{ { - in: append([]byte{0x8, 0x0, 0x0, 0x0}, zeroPaddedString("bananas", 32)...), + in: append([]byte{0x8, 0x0, 0x0, 0x0}, zeroPaddedString("potatoes", 16)...), labels: []config.Label{ { Name: "number", @@ -116,7 +116,7 @@ func TestDecodeLabels(t *testing.T) { }, }, out: []string{"8", "bananas"}, - err: true, // this label should be skipped, only tomatos allowed + err: true, // this label should be skipped, only tomatoes allowed }, } diff --git a/exporter/attach.go b/exporter/attach.go index 79e747de..65481703 100644 --- a/exporter/attach.go +++ b/exporter/attach.go @@ -7,7 +7,7 @@ import ( "github.com/cloudflare/ebpf_exporter/v2/config" ) -func attachModule(module *libbpfgo.Module, cfg config.Config) (map[*libbpfgo.BPFProg]bool, error) { +func attachModule(module *libbpfgo.Module, cfg config.Config) map[*libbpfgo.BPFProg]bool { attached := map[*libbpfgo.BPFProg]bool{} iter := module.Iterator() @@ -26,5 +26,5 @@ func attachModule(module *libbpfgo.Module, cfg config.Config) (map[*libbpfgo.BPF } } - return attached, nil + return attached } diff --git a/exporter/exporter.go b/exporter/exporter.go index 5e133f4c..513ed953 100644 --- a/exporter/exporter.go +++ b/exporter/exporter.go @@ -132,10 +132,7 @@ func (e *Exporter) Attach() error { return fmt.Errorf("error loading bpf object from %q for config %q: %v", cfg.BPFPath, cfg.Name, err) } - attachments, err := attachModule(module, cfg) - if err != nil { - return fmt.Errorf("failed to attach to config %q: %s", cfg.Name, err) - } + attachments := attachModule(module, cfg) e.attachedProgs[cfg.Name] = attachments e.modules[cfg.Name] = module @@ -160,10 +157,9 @@ func (e *Exporter) passKaddrs(module *libbpfgo.Module, cfg config.Config) error } name := fmt.Sprintf("kaddr_%s", kaddr) - if err := module.InitGlobalVariable(name, uint64(addr)); err != nil { + if err := module.InitGlobalVariable(name, addr); err != nil { return fmt.Errorf("error setting kaddr value for %q (const volatile %q) to 0x%x: %v", kaddr, name, addr, err) } - } return nil diff --git a/exporter/perf_event_array.go b/exporter/perf_event_array.go index 32dbd1f3..b5b6061f 100644 --- a/exporter/perf_event_array.go +++ b/exporter/perf_event_array.go @@ -53,7 +53,6 @@ func newPerfEventArraySink(decoders *decoder.Set, module *libbpfgo.Module, count } sink.counterVec.WithLabelValues(labelValues...).Inc() - } }(sink, receiveCh)