fix lint errors

Author: JoaoBraveCoding

.bingo/ginkgo.mod

@@ -1,5 +1,5 @@
 module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
 
-go 1.22.5
+go 1.22
 
 require github.com/onsi/ginkgo/v2 v2.20.2 // ginkgo

.bingo/golangci-lint.mod

@@ -1,5 +1,5 @@
 module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
 
-go 1.22.5
+go 1.22
 
 require github.com/golangci/golangci-lint v1.61.0 // cmd/golangci-lint

.circleci/config.yml

@@ -3,7 +3,7 @@ version: 2
 jobs:
   lint:
     docker:
-      - image: golang:1.20
+      - image: golang:1.22
     working_directory: ~/loki-benchmarks
     steps:
       - checkout

go.mod

@@ -18,6 +18,7 @@ require (
 )
 
 require (
+	github.com/ViaQ/logerr/v2 v2.1.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect

go.sum

@@ -1,3 +1,5 @@
+github.com/ViaQ/logerr/v2 v2.1.0 h1:8WwzuNa1x+a6tRUl+6sFel83A/QxlFBUaFW2FyG2zzY=
+github.com/ViaQ/logerr/v2 v2.1.0/go.mod h1:/qoWLm3YG40Sv5u75s4fvzjZ5p36xINzaxU2L+DJ9uw=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=

internal/loadclient/deployment.go

@@ -7,7 +7,7 @@ import (
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
@@ -60,7 +60,7 @@ func NewLoadClientDeployment(
 			Labels:    labels,
 		},
 		Spec: appsv1.DeploymentSpec{
-			Replicas: pointer.Int32(replicas),
+			Replicas: ptr.To(replicas),
 			Selector: &metav1.LabelSelector{
 				MatchLabels: labels,
 			},

internal/metrics/client.go

@@ -2,9 +2,11 @@ package metrics
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"time"
 
+	"github.com/ViaQ/logerr/v2/kverrors"
 	"github.com/onsi/gomega/gmeasure"
 	"github.com/prometheus/client_golang/api"
 	v1 "github.com/prometheus/client_golang/api/prometheus/v1"
@@ -19,6 +21,11 @@ const (
 	ReadRequestPath
 )
 
+var (
+	errNilExperiment = errors.New("error measuring experiment: nil experiment")
+	errUnknownPath   = errors.New("error unknown path specified")
+)
+
 type Client struct {
 	api               v1.API
 	timeout           time.Duration
@@ -39,20 +46,20 @@ func NewClient(url, token string, timeout time.Duration, cadvisorEnabled bool) (
 	}
 
 	if err := httpConfig.Validate(); err != nil {
-		return nil, fmt.Errorf("failed to validate httpConfig: %w", err)
+		return nil, kverrors.Wrap(err, "failed to validate httpConfig")
 	}
 
 	rt, err := config.NewRoundTripperFromConfig(httpConfig, "benchmarks-metrics")
 	if err != nil {
-		return nil, fmt.Errorf("failed creating prometheus configuration: %w", err)
+		return nil, kverrors.Wrap(err, "failed creating prometheus configuration")
 	}
 
 	pc, err := api.NewClient(api.Config{
 		Address:      url,
 		RoundTripper: rt,
 	})
 	if err != nil {
-		return nil, fmt.Errorf("failed creating prometheus client: %w", err)
+		return nil, kverrors.Wrap(err, "failed creating prometheus client")
 	}
 
 	return &Client{
@@ -64,12 +71,12 @@ func NewClient(url, token string, timeout time.Duration, cadvisorEnabled bool) (
 
 func (c *Client) Measure(e *gmeasure.Experiment, data Measurement) error {
 	if e == nil {
-		return fmt.Errorf("error measuring experiment: nil experiment")
+		return errNilExperiment
 	}
 
 	value, err := c.executeScalarQuery(data.Query)
 	if err != nil {
-		return fmt.Errorf("error measuring experiment: %s", err)
+		return kverrors.Wrap(err, "error measuring experiment")
 	}
 
 	e.RecordValue(data.Name, value, data.Unit, data.Annotation, gmeasure.Precision(4))
@@ -89,7 +96,7 @@ func (c *Client) MeasureHTTPRequestMetrics(
 	case ReadRequestPath:
 		return c.measureCommonRequestMetrics(e, job, HTTPGetMethod, HTTPQueryRangeRoute, HTTPReadPathRoutes, sampleRange, annotation)
 	default:
-		return fmt.Errorf("error unknown path specified: %d", path)
+		return kverrors.Wrap(errUnknownPath, "path", path)
 	}
 }
 
@@ -106,7 +113,7 @@ func (c *Client) MeasureGRPCRequestMetrics(
 	case ReadRequestPath:
 		return c.measureCommonRequestMetrics(e, job, GRPCMethod, GRPCQuerySampleRoute, GRPCReadPathRoutes, sampleRange, annotation)
 	default:
-		return fmt.Errorf("error unknown path specified: %d", path)
+		return kverrors.Wrap(errUnknownPath, "path", path)
 	}
 }
 
@@ -122,7 +129,7 @@ func (c *Client) MeasureIndexRequestMetrics(
 	case ReadRequestPath:
 		return c.Measure(e, RequestIndexRequestRate(IndexReadName, job, ReadOperation, "2.*", sampleRange))
 	default:
-		return fmt.Errorf("error unknown path specified: %d", path)
+		return kverrors.Wrap(errUnknownPath, "path", path)
 	}
 }
 
@@ -225,7 +232,7 @@ func (c *Client) executeScalarQuery(query string) (float64, error) {
 
 	res, _, err := c.api.Query(ctx, query, time.Now())
 	if err != nil {
-		return 0.0, fmt.Errorf("failed executing query %q: %w", query, err)
+		return 0.0, kverrors.Wrap(err, "failed executing query", "query", query)
 	}
 
 	switch res.Type() {
@@ -239,7 +246,7 @@ func (c *Client) executeScalarQuery(query string) (float64, error) {
 		}
 		return float64(vec[0].Value), nil
 	default:
-		return 0.0, fmt.Errorf("failed to parse result for query: %s", query)
+		return 0.0, kverrors.Wrap(err, "failed to parse result for query", "query", query)
 	}
 }
 

internal/querier/deployment.go

@@ -8,7 +8,7 @@ import (
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
@@ -90,7 +90,7 @@ func NewLogCLIDeployment(
 			Labels:    labels,
 		},
 		Spec: appsv1.DeploymentSpec{
-			Replicas: pointer.Int32(replicas),
+			Replicas: ptr.To(replicas),
 			Selector: &metav1.LabelSelector{
 				MatchLabels: labels,
 			},

internal/utils/wait.go

@@ -12,11 +12,14 @@ import (
 )
 
 func WaitForReadyDeployment(c client.Client, o client.Object, retry, timeout time.Duration) error {
-	return wait.Poll(retry, timeout, func() (done bool, err error) {
+	ctx, cancel := context.WithTimeout(context.Background(), timeout)
+	defer cancel()
+
+	return wait.PollUntilContextTimeout(ctx, retry, timeout, true, func(ctx context.Context) (done bool, err error) {
 		dpl := &appsv1.Deployment{}
 		key := client.ObjectKeyFromObject(o)
 
-		err = c.Get(context.TODO(), key, dpl)
+		err = c.Get(ctx, key, dpl)
 		if err != nil {
 			if errors.IsNotFound(err) {
 				return false, nil