chore: Update golangci-lint and fix issues (#4303)

* Update golangci-lint

* Use `--fix`

* Manually fix linting issues

Author: simonswine

.golangci.yml

@@ -1,95 +1,79 @@
-# This file contains all available configuration options
-# with their default values.
-
-# options for analysis running
+version: "2"
 run:
-  go: "1.21"
-  # default concurrency is a available CPU number
   concurrency: 16
-
-  # timeout for analysis, e.g. 30s, 5m, default is 1m
-  timeout: 10m
-
-  # exit code when at least one issue was found, default is 1
+  go: "1.21"
+  modules-download-mode: readonly
   issues-exit-code: 1
-
-  # include test files or not, default is true
   tests: true
-
-  # list of build tags, all linters use it. Default is empty list.
-  build-tags: []
-
-  modules-download-mode: readonly
-
-# output configuration options
 output:
-  # colored-line-number|line-number|json|tab|checkstyle, default is "colored-line-number"
   formats:
-    - format: colored-line-number
-
-  # print lines of code with issue, default is true
-  print-issued-lines: true
-
-  # print linter name in the end of issue text, default is true
-  print-linter-name: true
-
-linters-settings:
-  goimports:
-    local-prefixes: github.com/grafana/pyroscope/,github.com/grafana/pyroscope/api,github.com/grafana/pyroscope/tools,github.com/grafana/pyroscope/ebpf
-
-  depguard:
-    rules:
-      main:
-        deny:
-          - pkg: "github.com/go-kit/kit/log"
-            desc: "Use github.com/go-kit/log instead of github.com/go-kit/kit/log"
-
-  revive:
-    rules:
-      # This particular check seems to have problems with generic types and their receiver naming
-      - name: receiver-naming
-        disabled: true
-
+    text:
+      path: stdout
+      print-linter-name: true
+      print-issued-lines: true
 linters:
   enable:
-    - errcheck
+    - depguard
     - goconst
-    - gofmt
-    - goimports
-    - revive
-    - ineffassign
-    - staticcheck
     - misspell
+    - revive
     - unconvert
     - unparam
-    - govet
-    - typecheck
-    - depguard
-    - exportloopref
-
-issues:
-  exclude:
-    - Error return value of .*log\.Logger\)\.Log\x60 is not checked
-    - Error return value of .*.Log.* is not checked
-    - Error return value of `` is not checked
-    # See https://github.com/grpc/grpc-go/issues/7090 for more information
-    - grpc.Dial(.*) is deprecated
-
-  # which dirs to skip: they won't be analyzed;
-  # can use regexp here: generated.*, regexp is applied on full path;
-  # default value is empty list, but next dirs are always skipped independently
-  # from this option's value:
-  #   	vendor$, third_party$, testdata$, examples$, Godeps$, builtin$
-  exclude-dirs:
-    - win_eventlog$
-    - pkg/og
-
-  # which files to skip: they will be analyzed, but issues from them
-  # won't be reported. Default value is empty list, but there is
-  # no need to include all autogenerated files, we confidently recognize
-  # autogenerated files. If it's not please let us know.
-  exclude-files:
-    - .*.pb.go
-    - .*.y.go
-    - .*.rl.go
-
+  settings:
+    depguard:
+      rules:
+        main:
+          deny:
+            - pkg: github.com/go-kit/kit/log
+              desc: Use github.com/go-kit/log instead of github.com/go-kit/kit/log
+    revive:
+      rules:
+        - name: receiver-naming
+          disabled: true
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    rules:
+      - path: (.+)\.go$
+        text: Error return value of .*log\.Logger\)\.Log\x60 is not checked
+      - path: (.+)\.go$
+        text: Error return value of .*.Log.* is not checked
+      - path: (.+)\.go$
+        text: Error return value of `` is not checked
+      - path: (.+)\.go$
+        text: grpc.Dial(.*) is deprecated
+    paths:
+      - .*.pb.go
+      - .*.y.go
+      - .*.rl.go
+      - win_eventlog$
+      - pkg/og
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - gofmt
+    - goimports
+  settings:
+    goimports:
+      local-prefixes:
+        - github.com/grafana/pyroscope/
+        - github.com/grafana/pyroscope/api
+        - github.com/grafana/pyroscope/tools
+        - github.com/grafana/pyroscope/ebpf
+  exclusions:
+    generated: lax
+    paths:
+      - .*.pb.go
+      - .*.y.go
+      - .*.rl.go
+      - win_eventlog$
+      - pkg/og
+      - third_party$
+      - builtin$
+      - examples$

Makefile

@@ -310,7 +310,7 @@ $(BIN)/buf: Makefile
 
 $(BIN)/golangci-lint: Makefile
 	@mkdir -p $(@D)
-	GOBIN=$(abspath $(@D)) $(GO) install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.61.0
+	GOBIN=$(abspath $(@D)) $(GO) install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.2.2
 
 $(BIN)/protoc-gen-go: Makefile go.mod
 	@mkdir -p $(@D)

cmd/profilecli/bucket.go

@@ -3,7 +3,6 @@ package main
 import (
 	"context"
 	"embed"
-	_ "embed"
 	"fmt"
 	"log"
 	"net/http"

cmd/profilecli/canary_exporter_probes.go

@@ -48,10 +48,10 @@ func (ce *canaryExporter) testIngestProfile(ctx context.Context, now time.Time)
 	p.ForStacktraceString("func1").AddSamples(20)
 
 	// for testing the span selection
-	p.Profile.StringTable = append(p.Profile.StringTable, "profile_id", "00000bac2a5ab0c7")
-	p.Sample[1].Label = []*googlev1.Label{{Key: int64(len(p.Profile.StringTable) - 2), Str: int64(len(p.Profile.StringTable) - 1)}}
+	p.StringTable = append(p.StringTable, "profile_id", "00000bac2a5ab0c7")
+	p.Sample[1].Label = []*googlev1.Label{{Key: int64(len(p.StringTable) - 2), Str: int64(len(p.StringTable) - 1)}}
 
-	data, err := p.Profile.MarshalVT()
+	data, err := p.MarshalVT()
 	if err != nil {
 		return err
 	}

cmd/profilecli/query-blocks.go

@@ -134,7 +134,7 @@ func blocksQuerySeries(ctx context.Context, params *blocksQuerySeriesParams) err
 	var from, to int64
 	from, to = math.MaxInt64, math.MinInt64
 	var targetBlockQueriers phlaredb.Queriers
-	for _, blockId := range params.blocksQueryParams.BlockIds {
+	for _, blockId := range params.BlockIds {
 		meta, err := blockQuerier.BlockMeta(ctx, blockId)
 		if err != nil {
 			return err

cmd/profilecli/query-tracer.go

@@ -377,7 +377,7 @@ func queryTracer(ctx context.Context, params *queryTracerParams) (err error) {
 
 	if resp.StatusCode != http.StatusOK {
 		body, _ := io.ReadAll(io.LimitReader(resp.Body, 1024))
-		return fmt.Errorf("Tempo returned status code [%d]: %s ", resp.StatusCode, body)
+		return fmt.Errorf("tempo returned status code [%d]: %s ", resp.StatusCode, body)
 	}
 
 	var respBody struct {
@@ -454,7 +454,7 @@ func queryTracer(ctx context.Context, params *queryTracerParams) (err error) {
 
 			if resp.StatusCode != http.StatusOK {
 				body, _ := io.ReadAll(io.LimitReader(resp.Body, 1024))
-				return fmt.Errorf("Tempo returned status code [%d]: %s ", resp.StatusCode, body)
+				return fmt.Errorf("tempo returned status code [%d]: %s ", resp.StatusCode, body)
 			}
 
 			data, err := io.ReadAll(resp.Body)

cmd/profilecli/raft.go

@@ -40,7 +40,7 @@ func addRaftInfoParams(cmd commander) *raftInfoParams {
 }
 
 func raftInfo(ctx context.Context, params *raftInfoParams) error {
-	client := params.phlareClient.metadataOperatorClient()
+	client := params.metadataOperatorClient()
 
 	res, err := client.NodeInfo(ctx, connect.NewRequest(&raftnodepb.NodeInfoRequest{}))
 	if err != nil {
@@ -82,9 +82,9 @@ func formatHumanRaftInfo(node *raftnodepb.NodeInfo) string {
 		keyPadding := maxKeyPadding(keys)
 		for _, pair := range pairs {
 			key, value := pair[0], pair[1]
-			sb.WriteString(fmt.Sprintf("%s:", key))
+			fmt.Fprintf(sb, "%s:", key)
 			sb.WriteString(strings.Repeat(" ", keyPadding-len(key)+1))
-			sb.WriteString(fmt.Sprintf("%s\n", value))
+			fmt.Fprintf(sb, "%s\n", value)
 		}
 	}
 

cmd/profilecli/upload.go

@@ -49,7 +49,7 @@ func addUploadParams(cmd commander) *uploadParams {
 }
 
 func upload(ctx context.Context, params *uploadParams) (err error) {
-	pc := params.phlareClient.pusherClient()
+	pc := params.pusherClient()
 
 	lblStrings := make([]string, 0, len(params.extraLabels)*2)
 	for key, value := range params.extraLabels {
@@ -85,7 +85,7 @@ func upload(ctx context.Context, params *uploadParams) (err error) {
 		// detect name if no name has been set
 		if lbl.Get(model.LabelNameProfileName) == "" {
 			name := "unknown"
-			for _, t := range profile.Profile.SampleType {
+			for _, t := range profile.SampleType {
 				if sid := int(t.Type); sid < len(profile.StringTable) {
 					if s := profile.StringTable[sid]; s == "cpu" {
 						name = "process_cpu"

cmd/pyroscope/main.go

@@ -55,7 +55,7 @@ func errorHandler() {
 func main() {
 	var flags mainFlags
 
-	flags.Config.V2 = os.Getenv("PYROSCOPE_V2") != "" || os.Getenv("PYROSCOPE_V2_EXPERIMENT") != ""
+	flags.V2 = os.Getenv("PYROSCOPE_V2") != "" || os.Getenv("PYROSCOPE_V2_EXPERIMENT") != ""
 	if err := cfg.DynamicUnmarshal(&flags, os.Args[1:], flag.CommandLine); err != nil {
 		fmt.Fprintf(os.Stderr, "failed parsing config: %v\n", err)
 		errorHandler()

examples/language-sdk-instrumentation/golang-push/migrating-from-standard-pprof/main.go

@@ -78,7 +78,12 @@ func main() {
 	if err != nil {
 		log.Fatalf("Error starting profiler: %v", err)
 	}
-	defer profiler.Stop()
+	defer func() {
+		err := profiler.Stop()
+		if err != nil {
+			log.Printf("Error stopping profiler: %v", err)
+		}
+	}()
 
 	// pyroscope.Start is non-blocking: the profiler will start shortly.
 	// To ensure we don't miss the investigation, we wait briefly.