Merge pull request #355 from bobrik/ivan/golangci-lint-bump-v4

bobrik · web-flow · commit 3a1eed27684e · 2024-02-27T07:58:46.000-08:00
Bump golangci-lint to latest
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -344,9 +344,9 @@ jobs:
         run: go mod verify
 
       - name: Run golangci-lint
-        uses: golangci/golangci-lint-action@c67416616c29c3c48d26b59c45cadb56966d80aa # https://github.com/golangci/golangci-lint-action/issues/953
+        uses: golangci/golangci-lint-action@v4
         with:
-          version: v1.54.2
+          version: v1.56.2
         env:
           CGO_CFLAGS: "-I${{ github.workspace }}/libbpf/dest/usr/include"
 
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -5,8 +5,11 @@ linters:
     - exhaustive
     - exportloopref
     - forcetypeassert
+    - gochecksumtype
+    - gofmt
     - goimports
     - gomoddirectives
+    - inamedparam
     - interfacebloat
     - makezero
     - mirror
@@ -16,11 +19,13 @@ linters:
     - nilnil
     - nolintlint
     - nosprintfhostport
+    - perfsprint
     - prealloc
     - predeclared
     - promlinter
     - reassign
     - revive
+    - spancheck
     - stylecheck
     - tagalign
     - unconvert
diff --git a/Makefile b/Makefile
@@ -43,7 +43,7 @@ endif
 .PHONY: lint
 lint:
 	go mod verify
-	golangci-lint run ./...
+	CGO_LDFLAGS="$(CGO_LDFLAGS)" CGO_CFLAGS="$(CGO_CFLAGS)" golangci-lint run ./...
 
 .PHONY: jsonschema
 jsonschema:
diff --git a/benchmark/getpid_test.go b/benchmark/getpid_test.go
@@ -12,7 +12,7 @@ import (
 
 func init() {
 	libbpfgoCallbacks := libbpfgo.Callbacks{}
-	libbpfgoCallbacks.LogFilters = append(libbpfgoCallbacks.LogFilters, func(libLevel int, msg string) bool {
+	libbpfgoCallbacks.LogFilters = append(libbpfgoCallbacks.LogFilters, func(libLevel int, _ string) bool {
 		return libLevel == libbpfgo.LibbpfDebugLevel
 	})
 
diff --git a/cgroup/fanotify.go b/cgroup/fanotify.go
@@ -4,6 +4,7 @@ import (
 	"bufio"
 	"bytes"
 	"encoding/binary"
+	"errors"
 	"fmt"
 	"io"
 	"log"
@@ -42,7 +43,7 @@ func newFanotifyMonitor(path string) (*fanotifyMonitor, error) {
 	}
 
 	if !dacAllowed {
-		return nil, fmt.Errorf("missing CAP_DAC_READ_SEARCH needed for open_by_handle_at in fanotify monitor")
+		return nil, errors.New("missing CAP_DAC_READ_SEARCH needed for open_by_handle_at in fanotify monitor")
 	}
 
 	mapping, err := walk(path)
@@ -86,11 +87,11 @@ func (m *fanotifyMonitor) readFanotifyLoop() error {
 		}
 
 		if metadata.Mask&unix.FAN_CREATE == 0 {
-			return fmt.Errorf("fanotify event for non-create event")
+			return errors.New("fanotify event for non-create event")
 		}
 
 		if metadata.Mask&unix.FAN_ONDIR == 0 {
-			return fmt.Errorf("fanotify event for non-directory")
+			return errors.New("fanotify event for non-directory")
 		}
 
 		size := int(metadata.Event_len) - int(metadata.Metadata_len)
diff --git a/cgroup/monitor.go b/cgroup/monitor.go
@@ -5,7 +5,7 @@ import (
 )
 
 type monitor interface {
-	Resolve(int) string
+	Resolve(id int) string
 }
 
 // Monitor resolves cgroup ids into their respective paths
diff --git a/cmd/ebpf_exporter/main.go b/cmd/ebpf_exporter/main.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+	"errors"
 	"fmt"
 	"log"
 	"net/http"
@@ -38,7 +39,7 @@ func main() {
 
 	libbpfgoCallbacks := libbpfgo.Callbacks{Log: libbpfLogCallback}
 	if !*debug {
-		libbpfgoCallbacks.LogFilters = append(libbpfgoCallbacks.LogFilters, func(libLevel int, msg string) bool {
+		libbpfgoCallbacks.LogFilters = append(libbpfgoCallbacks.LogFilters, func(libLevel int, _ string) bool {
 			return libLevel == libbpfgo.LibbpfDebugLevel
 		})
 	}
@@ -109,7 +110,7 @@ func main() {
 	}
 
 	http.Handle(*metricsPath, promhttp.Handler())
-	http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
+	http.HandleFunc("/", func(w http.ResponseWriter, _ *http.Request) {
 		_, err = w.Write([]byte(`<html>
 			<head><title>eBPF Exporter</title></head>
 			<body>
@@ -147,7 +148,7 @@ func listen(addr string) error {
 		}
 
 		if len(listeners) < fd+1 {
-			return fmt.Errorf("no listeners passed via activation")
+			return errors.New("no listeners passed via activation")
 		}
 
 		return http.Serve(listeners[fd], nil)
diff --git a/config/config.go b/config/config.go
@@ -93,7 +93,7 @@ func ParseConfigs(dir string, names []string) ([]Config, error) {
 	configs := make([]Config, len(names))
 
 	for i, name := range names {
-		path := filepath.Join(dir, fmt.Sprintf("%s.yaml", name))
+		path := filepath.Join(dir, name+".yaml")
 
 		f, err := os.Open(path)
 		if err != nil {
@@ -114,7 +114,7 @@ func ParseConfigs(dir string, names []string) ([]Config, error) {
 			return nil, fmt.Errorf("error validating config: %v", err)
 		}
 
-		configs[i].BPFPath = filepath.Join(dir, fmt.Sprintf("%s.bpf.o", name))
+		configs[i].BPFPath = filepath.Join(dir, name+".bpf.o")
 	}
 
 	return configs, nil
diff --git a/decoder/decoder.go b/decoder/decoder.go
@@ -16,7 +16,7 @@ var ErrSkipLabelSet = errors.New("this label set should be skipped")
 // to either use as an input for another Decoder or to use as the final
 // label value for Prometheus metrics
 type Decoder interface {
-	Decode([]byte, config.Decoder) ([]byte, error)
+	Decode(in []byte, conf config.Decoder) ([]byte, error)
 }
 
 // Set is a set of Decoders that may be applied to produce a label
diff --git a/decoder/hex.go b/decoder/hex.go
@@ -1,7 +1,7 @@
 package decoder
 
 import (
-	"fmt"
+	"encoding/hex"
 
 	"github.com/cloudflare/ebpf_exporter/v2/config"
 )
@@ -11,5 +11,5 @@ type Hex struct{}
 
 // Decode transforms bytes into their hex string representation
 func (u *Hex) Decode(in []byte, _ config.Decoder) ([]byte, error) {
-	return []byte(fmt.Sprintf("%x", in)), nil
+	return []byte(hex.EncodeToString(in)), nil
 }
diff --git a/decoder/pci.go b/decoder/pci.go
@@ -7,14 +7,14 @@ import (
 	"github.com/jaypipes/pcidb"
 )
 
-const pciIdsPath = "/usr/share/misc/pci.ids"
-const missingPciIdsText = "missing pci.ids db"
+const pciIDsPath = "/usr/share/misc/pci.ids"
+const missingPciIDsText = "missing pci.ids db"
 
 var pci *pcidb.PCIDB
 
 func init() {
-	if _, err := os.Stat(pciIdsPath); err != nil {
-		log.Printf("PCI DB path %q is not accessible: %v", pciIdsPath, err)
+	if _, err := os.Stat(pciIDsPath); err != nil {
+		log.Printf("PCI DB path %q is not accessible: %v", pciIDsPath, err)
 		return
 	}
 
diff --git a/decoder/pci_class.go b/decoder/pci_class.go
@@ -13,7 +13,7 @@ type PCIClass struct{}
 // Decode transforms PCI class id into a name
 func (d *PCIClass) Decode(in []byte, _ config.Decoder) ([]byte, error) {
 	if pci == nil {
-		return []byte(missingPciIdsText), nil
+		return []byte(missingPciIDsText), nil
 	}
 
 	num, err := strconv.Atoi(string(in))
@@ -27,5 +27,5 @@ func (d *PCIClass) Decode(in []byte, _ config.Decoder) ([]byte, error) {
 		return []byte(device.Name), nil
 	}
 
-	return []byte(fmt.Sprintf("unknown pci class: 0x%s", key)), nil
+	return []byte("unknown pci class: 0x" + key), nil
 }
diff --git a/decoder/pci_device.go b/decoder/pci_device.go
@@ -13,7 +13,7 @@ type PCIDevice struct{}
 // Decode transforms PCI device id into a name
 func (d *PCIDevice) Decode(in []byte, _ config.Decoder) ([]byte, error) {
 	if pci == nil {
-		return []byte(missingPciIdsText), nil
+		return []byte(missingPciIDsText), nil
 	}
 
 	num, err := strconv.Atoi(string(in))
@@ -27,5 +27,5 @@ func (d *PCIDevice) Decode(in []byte, _ config.Decoder) ([]byte, error) {
 		return []byte(device.Name), nil
 	}
 
-	return []byte(fmt.Sprintf("unknown pci device: 0x%s", key)), nil
+	return []byte("unknown pci device: 0x" + key), nil
 }
diff --git a/decoder/pci_subclass.go b/decoder/pci_subclass.go
@@ -13,7 +13,7 @@ type PCISubClass struct{}
 // Decode transforms PCI class id into a name
 func (d *PCISubClass) Decode(in []byte, _ config.Decoder) ([]byte, error) {
 	if pci == nil {
-		return []byte(missingPciIdsText), nil
+		return []byte(missingPciIDsText), nil
 	}
 
 	num, err := strconv.Atoi(string(in))
@@ -34,5 +34,5 @@ func (d *PCISubClass) Decode(in []byte, _ config.Decoder) ([]byte, error) {
 		return []byte(fmt.Sprintf("unknown pci subclass: 0x%s (class 0x%s)", subclassID, classID)), nil
 	}
 
-	return []byte(fmt.Sprintf("unknown pci class: 0x%s", classID)), nil
+	return []byte("unknown pci class: 0x" + classID), nil
 }
diff --git a/decoder/pci_test.go b/decoder/pci_test.go
@@ -18,8 +18,8 @@ func testPCIMissing(t *testing.T, d Decoder, cases [][]byte) {
 			t.Errorf("Error decoding %#v: %v", c, err)
 		}
 
-		if !bytes.Equal(out, []byte(missingPciIdsText)) {
-			t.Errorf("Expected %q, got %s", missingPciIdsText, out)
+		if !bytes.Equal(out, []byte(missingPciIDsText)) {
+			t.Errorf("Expected %q, got %s", missingPciIDsText, out)
 		}
 	}
 }
diff --git a/decoder/pci_vendor.go b/decoder/pci_vendor.go
@@ -13,7 +13,7 @@ type PCIVendor struct{}
 // Decode transforms PCI vendor id into a name
 func (d *PCIVendor) Decode(in []byte, _ config.Decoder) ([]byte, error) {
 	if pci == nil {
-		return []byte(missingPciIdsText), nil
+		return []byte(missingPciIDsText), nil
 	}
 
 	num, err := strconv.Atoi(string(in))
@@ -27,5 +27,5 @@ func (d *PCIVendor) Decode(in []byte, _ config.Decoder) ([]byte, error) {
 		return []byte(vendor.Name), nil
 	}
 
-	return []byte(fmt.Sprintf("unknown pci vendor: 0x%s", key)), nil
+	return []byte("unknown pci vendor: 0x" + key), nil
 }
diff --git a/decoder/uint.go b/decoder/uint.go
@@ -2,6 +2,7 @@ package decoder
 
 import (
 	"fmt"
+	"strconv"
 
 	"github.com/cloudflare/ebpf_exporter/v2/config"
 	"github.com/cloudflare/ebpf_exporter/v2/util"
@@ -29,5 +30,5 @@ func (u *UInt) Decode(in []byte, _ config.Decoder) ([]byte, error) {
 		return nil, fmt.Errorf("unknown value length %d for %#v", len(in), in)
 	}
 
-	return []byte(fmt.Sprintf("%d", result)), nil
+	return []byte(strconv.FormatUint(result, 10)), nil
 }
diff --git a/exporter/exporter.go b/exporter/exporter.go
@@ -118,6 +118,7 @@ func (e *Exporter) Attach() error {
 	defer attachSpan.End()
 
 	_, registerHandlersSpan := tracer.Start(ctx, "register_handlers")
+	defer registerHandlersSpan.End()
 
 	err := registerHandlers()
 	if err != nil {
@@ -132,6 +133,7 @@ func (e *Exporter) Attach() error {
 	registerHandlersSpan.End()
 
 	ctx, attachConfigsSpan := tracer.Start(ctx, "attach_configs")
+	defer attachConfigsSpan.End()
 
 	for _, cfg := range e.configs {
 		ctx, attachConfigSpan := tracer.Start(ctx, "attach_config", trace.WithAttributes(attribute.String("config", cfg.Name)))
@@ -249,7 +251,7 @@ func (e *Exporter) passKaddrs(module *libbpfgo.Module, cfg config.Config) error
 			return fmt.Errorf("error finding kaddr for %q", kaddr)
 		}
 
-		name := fmt.Sprintf("kaddr_%s", kaddr)
+		name := "kaddr_" + kaddr
 		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)
 		}
diff --git a/tracing/demos/sock/main.go b/tracing/demos/sock/main.go
@@ -28,7 +28,7 @@ func main() {
 	_, dialSpan := tracer.Start(ctx, "dial")
 
 	dialer := net.Dialer{
-		Control: func(network, address string, c syscall.RawConn) error {
+		Control: func(_, _ string, c syscall.RawConn) error {
 			return c.Control(func(fd uintptr) {
 				sockSentParentSpan(fd, dialSpan)
 				connFd = fd

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ import (`
`4`	`4`	`"bufio"`
`5`	`5`	`"bytes"`
`6`	`6`	`"encoding/binary"`
	`7`	`+ "errors"`
`7`	`8`	`"fmt"`
`8`	`9`	`"io"`
`9`	`10`	`"log"`
`@@ -42,7 +43,7 @@ func newFanotifyMonitor(path string) (*fanotifyMonitor, error) {`
`42`	`43`	`}`
`43`	`44`
`44`	`45`	`if !dacAllowed {`
`45`		`- return nil, fmt.Errorf("missing CAP_DAC_READ_SEARCH needed for open_by_handle_at in fanotify monitor")`
	`46`	`+ return nil, errors.New("missing CAP_DAC_READ_SEARCH needed for open_by_handle_at in fanotify monitor")`
`46`	`47`	`}`
`47`	`48`
`48`	`49`	`mapping, err := walk(path)`
`@@ -86,11 +87,11 @@ func (m *fanotifyMonitor) readFanotifyLoop() error {`
`86`	`87`	`}`
`87`	`88`
`88`	`89`	`if metadata.Mask&unix.FAN_CREATE == 0 {`
`89`		`- return fmt.Errorf("fanotify event for non-create event")`
	`90`	`+ return errors.New("fanotify event for non-create event")`
`90`	`91`	`}`
`91`	`92`
`92`	`93`	`if metadata.Mask&unix.FAN_ONDIR == 0 {`
`93`		`- return fmt.Errorf("fanotify event for non-directory")`
	`94`	`+ return errors.New("fanotify event for non-directory")`
`94`	`95`	`}`
`95`	`96`
`96`	`97`	`size := int(metadata.Event_len) - int(metadata.Metadata_len)`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`	`)`
`6`	`6`
`7`	`7`	`type monitor interface {`
`8`		`- Resolve(int) string`
	`8`	`+ Resolve(id int) string`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`// Monitor resolves cgroup ids into their respective paths`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ func ParseConfigs(dir string, names []string) ([]Config, error) {`
`93`	`93`	`configs := make([]Config, len(names))`
`94`	`94`
`95`	`95`	`for i, name := range names {`
`96`		`- path := filepath.Join(dir, fmt.Sprintf("%s.yaml", name))`
	`96`	`+ path := filepath.Join(dir, name+".yaml")`
`97`	`97`
`98`	`98`	`f, err := os.Open(path)`
`99`	`99`	`if err != nil {`
`@@ -114,7 +114,7 @@ func ParseConfigs(dir string, names []string) ([]Config, error) {`
`114`	`114`	`return nil, fmt.Errorf("error validating config: %v", err)`
`115`	`115`	`}`
`116`	`116`
`117`		`- configs[i].BPFPath = filepath.Join(dir, fmt.Sprintf("%s.bpf.o", name))`
	`117`	`+ configs[i].BPFPath = filepath.Join(dir, name+".bpf.o")`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`return configs, nil`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ var ErrSkipLabelSet = errors.New("this label set should be skipped")`
`16`	`16`	`// to either use as an input for another Decoder or to use as the final`
`17`	`17`	`// label value for Prometheus metrics`
`18`	`18`	`type Decoder interface {`
`19`		`- Decode([]byte, config.Decoder) ([]byte, error)`
	`19`	`+ Decode(in []byte, conf config.Decoder) ([]byte, error)`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`// Set is a set of Decoders that may be applied to produce a label`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package decoder`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "fmt"`
	`4`	`+ "encoding/hex"`
`5`	`5`
`6`	`6`	`"github.com/cloudflare/ebpf_exporter/v2/config"`
`7`	`7`	`)`
`@@ -11,5 +11,5 @@ type Hex struct{}`
`11`	`11`
`12`	`12`	`// Decode transforms bytes into their hex string representation`
`13`	`13`	`func (u *Hex) Decode(in []byte, _ config.Decoder) ([]byte, error) {`
`14`		`- return []byte(fmt.Sprintf("%x", in)), nil`
	`14`	`+ return []byte(hex.EncodeToString(in)), nil`
`15`	`15`	`}`