fix lint

floreks · floreks · commit b4747c1ce2b4 · 2025-01-07T18:08:39.000+01:00
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -61,6 +61,6 @@ jobs:
         with:
           go-version-file: go.mod
           check-latest: true
-      - uses: golangci/golangci-lint-action@v3
+      - uses: golangci/golangci-lint-action@v6.1.1
         with:
           version: v1.63.4
diff --git a/.golangci.yml b/.golangci.yml
@@ -26,3 +26,9 @@ linters:
     - goconst
     - gocritic
     - misspell
+
+issues:
+  # Excluding configuration per-path, per-linter, per-text and per-source
+  exclude-files:
+    # Exclude some linters from running on tests files.
+    - .*_test\.go
diff --git a/cmd/agentk/agentkapp/app.go b/cmd/agentk/agentkapp/app.go
@@ -14,6 +14,7 @@ import (
 	"github.com/ash2k/stager"
 	"github.com/go-logr/zapr"
 	grpc_prometheus "github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus"
+	"go.opentelemetry.io/otel/trace/noop"
 
 	"github.com/pluralsh/kuberentes-agent/cmd"
 	"github.com/pluralsh/kuberentes-agent/pkg/agentcfg"
@@ -36,6 +37,7 @@ import (
 	"github.com/pluralsh/kuberentes-agent/pkg/tool/tlstool"
 	"github.com/pluralsh/kuberentes-agent/pkg/tool/wstunnel"
 
+	"github.com/coder/websocket"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/collectors"
 	"github.com/spf13/cobra"
@@ -61,7 +63,6 @@ import (
 	"k8s.io/client-go/tools/record"
 	"k8s.io/klog/v2"
 	"k8s.io/kubectl/pkg/cmd/util"
-	"nhooyr.io/websocket"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 )
 
@@ -129,7 +130,7 @@ func (a *App) Run(ctx context.Context) (retErr error) {
 	unaryClientProm := clientProm.UnaryClientInterceptor()
 
 	// TODO Tracing
-	tp := trace.NewNoopTracerProvider()
+	tp := noop.NewTracerProvider()
 	p := propagation.NewCompositeTextMapPropagator(propagation.TraceContext{}, propagation.Baggage{})
 
 	// TODO metrics via OTEL
@@ -416,7 +417,7 @@ func (a *App) constructKasConnection(ctx context.Context, tp trace.TracerProvide
 		opts = append(opts, grpc.WithTransportCredentials(insecure.NewCredentials()))
 	}
 	opts = append(opts, grpc.WithPerRPCCredentials(grpctool2.NewTokenCredentials(a.AgentToken, !secure)))
-	conn, err := grpc.DialContext(ctx, addressToDial, opts...)
+	conn, err := grpc.NewClient(addressToDial, opts...)
 	if err != nil {
 		return nil, fmt.Errorf("gRPC.dial: %w", err)
 	}
diff --git a/cmd/agentk/agentkapp/app_internal_server.go b/cmd/agentk/agentkapp/app_internal_server.go
@@ -32,7 +32,7 @@ func newInternalServer(log *zap.Logger, tp trace.TracerProvider, mp otelmetric.M
 	listener := grpctool2.NewDialListener()
 
 	// Construct connection to internal gRPC server
-	conn, err := grpc.DialContext(context.Background(), "passthrough:pipe", // nolint: contextcheck
+	conn, err := grpc.NewClient("passthrough:pipe", // nolint: contextcheck
 		grpc.WithSharedWriteBuffer(true),
 		grpc.WithContextDialer(listener.DialContext),
 		grpc.WithTransportCredentials(insecure.NewCredentials()),
diff --git a/cmd/kas/kasapp/app_agent_server.go b/cmd/kas/kasapp/app_agent_server.go
@@ -21,6 +21,7 @@ import (
 	"github.com/pluralsh/kuberentes-agent/pkg/tool/tlstool"
 	"github.com/pluralsh/kuberentes-agent/pkg/tool/wstunnel"
 
+	"github.com/coder/websocket"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/redis/rueidis"
 	"go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc"
@@ -32,7 +33,6 @@ import (
 	"google.golang.org/grpc/credentials"
 	"google.golang.org/grpc/keepalive"
 	"google.golang.org/grpc/stats"
-	"nhooyr.io/websocket"
 )
 
 const (
diff --git a/cmd/kas/kasapp/app_internal_server.go b/cmd/kas/kasapp/app_internal_server.go
@@ -1,7 +1,6 @@
 package kasapp
 
 import (
-	"context"
 	"net"
 
 	"github.com/ash2k/stager"
@@ -32,7 +31,7 @@ func newInternalServer(tp trace.TracerProvider, mp otelmetric.MeterProvider, p p
 	listener := grpctool2.NewDialListener()
 
 	// Construct connection to internal gRPC server
-	conn, err := grpc.DialContext(context.Background(), "passthrough:pipe", // nolint: contextcheck
+	conn, err := grpc.NewClient("passthrough:pipe", // nolint: contextcheck
 		grpc.WithStatsHandler(otelgrpc.NewServerHandler(
 			otelgrpc.WithTracerProvider(tp),
 			otelgrpc.WithMeterProvider(mp),
diff --git a/cmd/kas/kasapp/app_private_api_server.go b/cmd/kas/kasapp/app_private_api_server.go
@@ -240,7 +240,7 @@ func newKasPool(log *zap.Logger, errRep errz.ErrReporter, tp trace.TracerProvide
 	}
 
 	// Construct in-memory connection to private API gRPC server
-	inMemConn, err := grpc.DialContext(context.Background(), "passthrough:pipe", // nolint: contextcheck
+	inMemConn, err := grpc.NewClient("passthrough:pipe", // nolint: contextcheck
 		append([]grpc.DialOption{
 			grpc.WithContextDialer(dialer),
 			grpc.WithTransportCredentials(insecure.NewCredentials()),
@@ -350,7 +350,7 @@ func detectUrlByCIDR(interfaceAddrs func() ([]net.Addr, error),
 				return "", fmt.Errorf("listener address: %w", err)
 			}
 			portStr = listenPort
-		//case "unix": We don't handle unix scheme here because we got OWN_PRIVATE_API_CIDR and hence presumably
+		// case "unix": We don't handle unix scheme here because we got OWN_PRIVATE_API_CIDR and hence presumably
 		// user wants to use network, not unix socket.
 		default:
 			return "", fmt.Errorf("cannot determine port for own URL. Specify %s", envVarOwnPrivateApiPort)
diff --git a/cmd/kas/kasapp/configured_app.go b/cmd/kas/kasapp/configured_app.go
@@ -15,6 +15,7 @@ import (
 	"github.com/ash2k/stager"
 	"github.com/getsentry/sentry-go"
 	grpc_prometheus "github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus"
+	"go.opentelemetry.io/otel/trace/noop"
 
 	usage_metrics_server "github.com/pluralsh/kuberentes-agent/pkg/module/usage_metrics/server"
 
@@ -450,7 +451,10 @@ func (a *ConfiguredApp) constructRedisClient(tp trace.TracerProvider, mp otelmet
 	}
 	if a.isTracingEnabled() {
 		// Instrument Redis client with tracing only if it's configured.
-		redisClient = rueidisotel.WithClient(redisClient, rueidisotel.WithTracerProvider(tp), rueidisotel.WithMeterProvider(mp))
+		redisClient, err = rueidisotel.NewClient(opts, rueidisotel.WithTracerProvider(tp), rueidisotel.WithMeterProvider(mp))
+		if err != nil {
+			return nil, err
+		}
 	}
 	return redisClient, nil
 }
@@ -527,7 +531,7 @@ func (a *ConfiguredApp) constructOTELMeterProvider(r *resource.Resource, reg pro
 
 func (a *ConfiguredApp) constructOTELTracingTools(ctx context.Context, r *resource.Resource) (trace.TracerProvider, propagation.TextMapPropagator, func() error, error) {
 	if !a.isTracingEnabled() {
-		return trace.NewNoopTracerProvider(), propagation.NewCompositeTextMapPropagator(), func() error { return nil }, nil
+		return noop.NewTracerProvider(), propagation.NewCompositeTextMapPropagator(), func() error { return nil }, nil
 	}
 
 	// Exporter must be constructed right before TracerProvider as it's started implicitly so needs to be stopped,
diff --git a/cmd/kas/kasapp/router_kas_tunnel_finder.go b/cmd/kas/kasapp/router_kas_tunnel_finder.go
@@ -26,8 +26,8 @@ var (
 		ClientStreams: true,
 	}
 
-	// tunnelReadySentinelError is a sentinel error value to make stream visitor exit early.
-	tunnelReadySentinelError = errors.New("")
+	// errTunnelReadySentinel is a sentinel error value to make stream visitor exit early.
+	errTunnelReadySentinel = errors.New("")
 )
 
 type kasConnAttempt struct {
@@ -248,15 +248,15 @@ func (f *tunnelFinder) tryKasAsync(ctx context.Context, cancel context.CancelFun
 			}),
 			grpctool2.WithCallback(tunnelReadyFieldNumber, func(tunnelReady *GatewayKasResponse_TunnelReady) error {
 				trace.SpanFromContext(kasStream.Context()).AddEvent("Ready")
-				return tunnelReadySentinelError
+				return errTunnelReadySentinel
 			}),
 			grpctool2.WithNotExpectingToGet(codes.Internal, headerFieldNumber, messageFieldNumber, trailerFieldNumber, errorFieldNumber),
 		)
-		switch err { // nolint:errorlint
-		case nil:
+		switch { // nolint:errorlint
+		case err == nil:
 			// Gateway kas closed the connection cleanly, perhaps it's been open for too long
 			return nil, retry.ContinueImmediately
-		case tunnelReadySentinelError:
+		case errors.Is(err, errTunnelReadySentinel):
 			// fallthrough
 		default:
 			f.rpcApi.HandleProcessingError(log, f.agentId, "RecvMsg(GatewayKasResponse)", err)
diff --git a/go.mod b/go.mod
@@ -14,6 +14,7 @@ require (
 require (
 	github.com/alicebob/miniredis/v2 v2.34.0
 	github.com/ash2k/stager v0.4.0
+	github.com/coder/websocket v1.8.12
 	github.com/getsentry/sentry-go v0.31.1
 	github.com/go-logr/zapr v1.3.0
 	github.com/golang-jwt/jwt/v5 v5.2.1
@@ -52,7 +53,6 @@ require (
 	k8s.io/klog/v2 v2.130.1
 	k8s.io/kubectl v0.32.0
 	k8s.io/utils v0.0.0-20241210054802-24370beab758
-	nhooyr.io/websocket v1.8.17
 	sigs.k8s.io/controller-runtime v0.19.3
 	sigs.k8s.io/yaml v1.4.0
 )
diff --git a/go.sum b/go.sum
@@ -106,6 +106,8 @@ github.com/chavacava/garif v0.1.0 h1:2JHa3hbYf5D9dsgseMKAmc/MZ109otzgNFk5s87H9Pc
 github.com/chavacava/garif v0.1.0/go.mod h1:XMyYCkEL58DF0oyW4qDjjnPWONs2HBqYKI+UIPD+Gww=
 github.com/ckaznocha/intrange v0.3.0 h1:VqnxtK32pxgkhJgYQEeOArVidIPg+ahLP7WBOXZd5ZY=
 github.com/ckaznocha/intrange v0.3.0/go.mod h1:+I/o2d2A1FBHgGELbGxzIcyd3/9l9DuwjM8FsbSS3Lo=
+github.com/coder/websocket v1.8.12 h1:5bUXkEPPIbewrnkU8LTCLVaxi4N4J8ahufH2vlo4NAo=
+github.com/coder/websocket v1.8.12/go.mod h1:LNVeNrXQZfe5qhS9ALED3uA+l5pPqvwXg3CKoDBB2gs=
 github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY=
 github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
@@ -825,8 +827,6 @@ mvdan.cc/gofumpt v0.7.0 h1:bg91ttqXmi9y2xawvkuMXyvAA/1ZGJqYAEGjXuP0JXU=
 mvdan.cc/gofumpt v0.7.0/go.mod h1:txVFJy/Sc/mvaycET54pV8SW8gWxTlUuGHVEcncmNUo=
 mvdan.cc/unparam v0.0.0-20240528143540-8a5130ca722f h1:lMpcwN6GxNbWtbpI1+xzFLSW8XzX0u72NttUGVFjO3U=
 mvdan.cc/unparam v0.0.0-20240528143540-8a5130ca722f/go.mod h1:RSLa7mKKCNeTTMHBw5Hsy2rfJmd6O2ivt9Dw9ZqCQpQ=
-nhooyr.io/websocket v1.8.17 h1:KEVeLJkUywCKVsnLIDlD/5gtayKp8VoCkksHCGGfT9Y=
-nhooyr.io/websocket v1.8.17/go.mod h1:rN9OFWIUwuxg4fR5tELlYC04bXYowCP9GX47ivo2l+c=
 sigs.k8s.io/controller-runtime v0.19.3 h1:XO2GvC9OPftRst6xWCpTgBZO04S2cbp0Qqkj8bX1sPw=
 sigs.k8s.io/controller-runtime v0.19.3/go.mod h1:j4j87DqtsThvwTv5/Tc5NFRyyF/RF0ip4+62tbTSIUM=
 sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=
diff --git a/pkg/module/agent_tracker/tracker.go b/pkg/module/agent_tracker/tracker.go
@@ -96,9 +96,9 @@ func (t *RedisTracker) RegisterConnection(ctx context.Context, info *ConnectedAg
 	t.mu.Lock()
 	defer t.mu.Unlock()
 	var wg errgroup.Group
-	//wg.Go(func() error {
+	// wg.Go(func() error {
 	//	return t.connectionsByClusterId.Set(ctx, info.ProjectId, info.ConnectionId, infoBytes)
-	//})
+	// })
 	wg.Go(func() error {
 		return t.connectionsByAgentId.Set(ctx, info.AgentId, info.ConnectionId, infoBytes)
 	})
@@ -112,9 +112,9 @@ func (t *RedisTracker) UnregisterConnection(ctx context.Context, info *Connected
 	t.mu.Lock()
 	defer t.mu.Unlock()
 	var wg errgroup.Group
-	//wg.Go(func() error {
+	// wg.Go(func() error {
 	//	return t.connectionsByClusterId.Unset(ctx, info.ProjectId, info.ConnectionId)
-	//})
+	// })
 	wg.Go(func() error {
 		return t.connectionsByAgentId.Unset(ctx, info.AgentId, info.ConnectionId)
 	})
diff --git a/pkg/module/kubernetes_api/rpc/rpc_extra.go b/pkg/module/kubernetes_api/rpc/rpc_extra.go
@@ -1,6 +1,5 @@
 package rpc
 
-
 func (x *ImpersonationConfig) IsEmpty() bool {
 	if x == nil {
 		return true
diff --git a/pkg/module/kubernetes_api/server/defaulting.go b/pkg/module/kubernetes_api/server/defaulting.go
@@ -30,7 +30,7 @@ func ApplyDefaults(config *kascfg.ConfigurationFile) {
 	prototool.Duration(&o.Listen.ListenGracePeriod, defaultListenGracePeriod)
 	prototool.Duration(&o.Listen.ShutdownGracePeriod, defaultShutdownGracePeriod)
 	if !strings.HasSuffix(o.UrlPathPrefix, "/") {
-		o.UrlPathPrefix = o.UrlPathPrefix + "/"
+		o.UrlPathPrefix += "/"
 	}
 	prototool.Duration(&o.AllowedAgentCacheTtl, defaultAllowedAgentInfoCacheTTL)
 	prototool.Duration(&o.AllowedAgentCacheErrorTtl, defaultAllowedAgentInfoCacheErrorTTL)
diff --git a/pkg/module/kubernetes_api/server/proxy.go b/pkg/module/kubernetes_api/server/proxy.go
@@ -79,7 +79,6 @@ type kubernetesApiProxy struct {
 	log                      *zap.Logger
 	api                      modserver.Api
 	kubernetesApiClient      rpc2.KubernetesApiClient
-	gitLabClient             gitlab2.ClientInterface
 	pluralUrl                string
 	allowedOriginUrls        []string
 	allowedAgentsCache       *cache.CacheWithErr[string, *pluralapi.AllowedAgentsForJob]
@@ -251,7 +250,7 @@ func (p *kubernetesApiProxy) authenticateAndImpersonateRequest(ctx context.Conte
 		}
 		// update usage metrics for PAT requests using the CI tunnel
 		p.patAccessRequestCounter.Inc()
-		//p.patAccessUsersCounter.Add(userId)
+		// p.patAccessUsersCounter.Add(userId)
 		p.patAccessAgentsCounter.Add(agentId)
 	default: // This should never happen
 		msg := "Invalid authorization type"
@@ -348,7 +347,7 @@ func (p *kubernetesApiProxy) mergeProxiedResponseHeaders(outbound, inbound http.
 	}
 	// explicitly merge Vary header with the headers from proxies requests.
 	// We always set the Vary header to `Origin` for CORS
-	if v := append(inbound[httpz2.VaryHeader], outbound[httpz2.VaryHeader]...); len(v) > 0 {
+	if v := append(inbound[httpz2.VaryHeader], outbound[httpz2.VaryHeader]...); len(v) > 0 { //nolint:gocritic
 		inbound[httpz2.VaryHeader] = v
 	}
 	inbound[httpz2.ViaHeader] = append(inbound[httpz2.ViaHeader], p.serverVia)
@@ -422,8 +421,7 @@ func getAuthorizationInfoFromRequest(r *http.Request) (int64 /* agentId */, any,
 		if err != nil {
 			return 0, nil, err
 		}
-		switch tokenType {
-		case tokenTypePlural:
+		if tokenType == tokenTypePlural {
 			return agentId, patAuthn{
 				token:     token,
 				clusterId: clusterId,
diff --git a/pkg/tool/grpctool/client_requests_in_flight_stats_handler.go b/pkg/tool/grpctool/client_requests_in_flight_stats_handler.go
@@ -26,13 +26,11 @@ type ClientRequestsInFlightStatsHandler struct {
 func (h *ClientRequestsInFlightStatsHandler) HandleRPC(ctx context.Context, stat stats.RPCStats) {
 	switch stat.(type) {
 	case *stats.OutHeader:
-		switch {
-		case stat.IsClient():
+		if stat.IsClient() {
 			h.vec.WithLabelValues(labels(ctx, stat)...).Inc()
 		}
 	case *stats.End:
-		switch {
-		case stat.IsClient():
+		if stat.IsClient() {
 			h.vec.WithLabelValues(labels(ctx, stat)...).Dec()
 		}
 	}
diff --git a/pkg/tool/grpctool/inbound_http_to_outbound_grpc.go b/pkg/tool/grpctool/inbound_http_to_outbound_grpc.go
@@ -39,8 +39,8 @@ var (
 		httpz2.UpgradeHeader,
 	}
 
-	// earlyExitError is a sentinel error value to make stream visitor exit early.
-	earlyExitError = errors.New("")
+	// errEarlyExit is a sentinel error value to make stream visitor exit early.
+	errEarlyExit = errors.New("")
 )
 
 type HttpRequestClient interface {
@@ -162,15 +162,15 @@ func (x *InboundHttpToOutboundGrpc) pipeOutboundToInbound(outboundClient HttpReq
 		WithCallback(HttpResponseTrailerFieldNumber, func(trailer *HttpResponse_Trailer) error {
 			if isUpgrade && responseStatusCode == http.StatusSwitchingProtocols {
 				// Successful upgrade.
-				return earlyExitError
+				return errEarlyExit
 			}
 			return nil
 		}),
 		// if it's a successful upgrade, then this field is unreachable because of the early exit above.
 		// otherwise, (unsuccessful upgrade or not an upgrade) the remote must not send this field.
 		WithNotExpectingToGet(codes.Internal, HttpResponseUpgradeDataFieldNumber),
 	)
-	if err != nil && err != earlyExitError { // nolint: errorlint
+	if err != nil && err != errEarlyExit { // nolint: errorlint
 		if writeFailed {
 			// there is likely a connection problem so the client will likely not receive this
 			return headerWritten, responseStatusCode, x.handleIoError("failed to write HTTP response", err)
diff --git a/pkg/tool/grpctool/max_conn_age_wstunnel_test.go b/pkg/tool/grpctool/max_conn_age_wstunnel_test.go
@@ -18,7 +18,7 @@ import (
 	"google.golang.org/grpc/stats"
 	"k8s.io/apimachinery/pkg/util/rand"
 	"k8s.io/apimachinery/pkg/util/wait"
-	"nhooyr.io/websocket"
+	"github.com/coder/websocket"
 
 	test2 "github.com/pluralsh/kuberentes-agent/pkg/tool/grpctool/test"
 	"github.com/pluralsh/kuberentes-agent/pkg/tool/httpz"
diff --git a/pkg/tool/grpctool/pool.go b/pkg/tool/grpctool/pool.go
@@ -84,7 +84,7 @@ func (p *Pool) Dial(ctx context.Context, targetUrl string) (PoolConn, error) {
 		opts := make([]grpc.DialOption, 0, len(p.dialOpts)+1)
 		opts = append(opts, grpc.WithTransportCredentials(creds))
 		opts = append(opts, p.dialOpts...)
-		grpcConn, err := grpc.DialContext(ctx, target, opts...)
+		grpcConn, err := grpc.NewClient(target, opts...)
 		if err != nil {
 			return nil, fmt.Errorf("pool gRPC dial: %w", err)
 		}
diff --git a/pkg/tool/grpctool/server_requests_in_flight_stats_handler.go b/pkg/tool/grpctool/server_requests_in_flight_stats_handler.go
@@ -25,13 +25,11 @@ type ServerRequestsInFlightStatsHandler struct {
 func (h *ServerRequestsInFlightStatsHandler) HandleRPC(ctx context.Context, stat stats.RPCStats) {
 	switch stat.(type) {
 	case *stats.Begin:
-		switch {
-		case !stat.IsClient():
+		if !stat.IsClient() {
 			h.vec.WithLabelValues(labels(ctx, stat)...).Inc()
 		}
 	case *stats.End:
-		switch {
-		case !stat.IsClient():
+		if !stat.IsClient() {
 			h.vec.WithLabelValues(labels(ctx, stat)...).Dec()
 		}
 	}
diff --git a/pkg/tool/grpctool/stats_handler.go b/pkg/tool/grpctool/stats_handler.go
@@ -12,6 +12,7 @@ const (
 	labelService = "grpc_service"
 	labelMethod  = "grpc_method"
 	namespace    = "grpc"
+	unknown      = "unknown"
 )
 
 type metricsCtxKey struct{}
@@ -56,13 +57,13 @@ func (h *baseStatsHandler) Collect(in chan<- prometheus.Metric) {
 
 func parseMethod(name string) (string, string) {
 	if !strings.HasPrefix(name, "/") {
-		return "unknown", "unknown"
+		return unknown, unknown
 	}
 	name = name[1:]
 
 	pos := strings.LastIndex(name, "/")
 	if pos < 0 {
-		return "unknown", "unknown"
+		return unknown, unknown
 	}
 	return name[:pos], name[pos+1:]
 }
diff --git a/pkg/tool/redistool/expiring_hash.go b/pkg/tool/redistool/expiring_hash.go
diff --git a/pkg/tool/redistool/expiring_hash_test.go b/pkg/tool/redistool/expiring_hash_test.go
diff --git a/pkg/tool/redistool/transaction.go b/pkg/tool/redistool/transaction.go
diff --git a/pkg/tool/syncz/subscriptions.go b/pkg/tool/syncz/subscriptions.go
diff --git a/pkg/tool/testing/kube_testing/cmp_options.go b/pkg/tool/testing/kube_testing/cmp_options.go
diff --git a/pkg/tool/testing/matcher/matchers.go b/pkg/tool/testing/matcher/matchers.go
diff --git a/pkg/tool/wstunnel/client.go b/pkg/tool/wstunnel/client.go
diff --git a/pkg/tool/wstunnel/server.go b/pkg/tool/wstunnel/server.go
diff --git a/pkg/tool/wstunnel/server_test.go b/pkg/tool/wstunnel/server_test.go

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ import (`
`15`	`15`	`"github.com/ash2k/stager"`
`16`	`16`	`"github.com/getsentry/sentry-go"`
`17`	`17`	`grpc_prometheus "github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus"`
	`18`	`+ "go.opentelemetry.io/otel/trace/noop"`
`18`	`19`
`19`	`20`	`usage_metrics_server "github.com/pluralsh/kuberentes-agent/pkg/module/usage_metrics/server"`
`20`	`21`
`@@ -450,7 +451,10 @@ func (a *ConfiguredApp) constructRedisClient(tp trace.TracerProvider, mp otelmet`
`450`	`451`	`}`
`451`	`452`	`if a.isTracingEnabled() {`
`452`	`453`	`// Instrument Redis client with tracing only if it's configured.`
`453`		`- redisClient = rueidisotel.WithClient(redisClient, rueidisotel.WithTracerProvider(tp), rueidisotel.WithMeterProvider(mp))`
	`454`	`+ redisClient, err = rueidisotel.NewClient(opts, rueidisotel.WithTracerProvider(tp), rueidisotel.WithMeterProvider(mp))`
	`455`	`+ if err != nil {`
	`456`	`+ return nil, err`
	`457`	`+ }`
`454`	`458`	`}`
`455`	`459`	`return redisClient, nil`
`456`	`460`	`}`
`@@ -527,7 +531,7 @@ func (a ConfiguredApp) constructOTELMeterProvider(r resource.Resource, reg pro`
`527`	`531`
`528`	`532`	`func (a ConfiguredApp) constructOTELTracingTools(ctx context.Context, r resource.Resource) (trace.TracerProvider, propagation.TextMapPropagator, func() error, error) {`
`529`	`533`	`if !a.isTracingEnabled() {`
`530`		`- return trace.NewNoopTracerProvider(), propagation.NewCompositeTextMapPropagator(), func() error { return nil }, nil`
	`534`	`+ return noop.NewTracerProvider(), propagation.NewCompositeTextMapPropagator(), func() error { return nil }, nil`
`531`	`535`	`}`
`532`	`536`
`533`	`537`	`// Exporter must be constructed right before TracerProvider as it's started implicitly so needs to be stopped,`