dep upgrades 1 (#190)

* Upgrade deps

* Modernize

Author: vitaminmoo

actor.go

@@ -24,15 +24,14 @@ type Actor interface {
 // to start, its type will be equal to its name
 // unless its changed:
 //
-//     start := NewActorStart("worker")
+//	start := NewActorStart("worker")
 //
 // Format names can also be used for more complicated
 // names, just remember to override the type:
 //
-//     start := NewActorStart("worker-%d-group-%d", i, j)
-//     start.Type = "worker"
-//
-func NewActorStart(name string, v ...interface{}) *ActorStart {
+//	start := NewActorStart("worker-%d-group-%d", i, j)
+//	start.Type = "worker"
+func NewActorStart(name string, v ...any) *ActorStart {
 	fullName := name
 	if len(v) > 0 {
 		fullName = fmt.Sprintf(name, v...)

cfg.go

@@ -8,7 +8,7 @@ import (
 // Logger hides the logging function Printf behind a simple
 // interface so libraries such as logrus can be used.
 type Logger interface {
-	Printf(string, ...interface{})
+	Printf(string, ...any)
 }
 
 // ClientCfg where the only required argument is Namespace,

client.go

@@ -5,6 +5,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"maps"
 	"math/rand"
 	"strconv"
 	"strings"
@@ -32,7 +33,7 @@ import (
 //
 //	Register(MyMsg{})    // Correct
 //	Register(&MyMsg{})   // Incorrect
-func Register(v interface{}) error {
+func Register(v any) error {
 	return codec.Register(v)
 }
 
@@ -152,7 +153,7 @@ func (c *Client) Close() error {
 }
 
 // Request a response for the given message. The context can be used to control cancelation or timeouts.
-func (c *Client) Request(ctx context.Context, receiver string, msg interface{}) (interface{}, error) {
+func (c *Client) Request(ctx context.Context, receiver string, msg any) (any, error) {
 	if c == nil {
 		return nil, ErrNilClient
 	}
@@ -278,8 +279,7 @@ func (c *Client) getCCLocked(ctx context.Context, nsReceiver string) (*clientAnd
 					Backoff:           grpcBackoff.Config{MaxDelay: 20 * time.Second},
 					MinConnectTimeout: 1 * time.Second,
 				}),
-				grpc.WithUnaryInterceptor(otelgrpc.UnaryClientInterceptor()),
-				grpc.WithStreamInterceptor(otelgrpc.StreamClientInterceptor()),
+				grpc.WithStatsHandler(otelgrpc.NewClientHandler()),
 			)
 			if err != nil {
 				return nil, noID, err
@@ -383,15 +383,15 @@ func (c *Client) handleGRPCErrs(ctx context.Context, err error, nsReceiver strin
 	return false
 }
 
-func (c *Client) logf(format string, v ...interface{}) {
+func (c *Client) logf(format string, v ...any) {
 	if c.cfg.Logger != nil {
 		c.cfg.Logger.Printf(format, v...)
 	}
 }
 
 // BroadcastC (broadcast) a message to all members in a Group. The context can be used to control
 // cancellations or timeouts
-func (c *Client) Broadcast(ctx context.Context, g *Group, msg interface{}) (BroadcastResult, error) {
+func (c *Client) Broadcast(ctx context.Context, g *Group, msg any) (BroadcastResult, error) {
 	if c == nil {
 		return nil, ErrNilClient
 	}
@@ -404,7 +404,7 @@ func (c *Client) Broadcast(ctx context.Context, g *Group, msg interface{}) (Broa
 	return c.broadcast(cont, cancel, g, msg)
 }
 
-func (c *Client) broadcast(ctx context.Context, cancel context.CancelFunc, g *Group, msg interface{}) (BroadcastResult, error) {
+func (c *Client) broadcast(ctx context.Context, cancel context.CancelFunc, g *Group, msg any) (BroadcastResult, error) {
 	res := make(BroadcastResult)
 	receivers := g.Members()
 
@@ -496,15 +496,13 @@ type BroadcastResult map[string]*Result
 // Result stores the result of a Request
 type Result struct {
 	Err error
-	Val interface{}
+	Val any
 }
 
 // Add combines two BroadcastResults, by overwriting previous
 // results if they exist
 func (b BroadcastResult) Add(other BroadcastResult) {
-	for k, v := range other {
-		b[k] = v
-	}
+	maps.Copy(b, other)
 }
 
 // statName of interesting statistic to track

client_test.go

@@ -217,7 +217,7 @@ func TestClientBroadcast(t *testing.T) {
 
 	// start up the actors
 	const numActors = 2
-	for i := 0; i < numActors; i++ {
+	for i := range numActors {
 		startEchoActor(fmt.Sprintf("echo-%d", i))
 	}
 
@@ -232,7 +232,7 @@ func TestClientBroadcast(t *testing.T) {
 		} else if len(res) != numActors {
 			t.Fatal("expected response")
 		}
-		for i := 0; i < numActors; i++ {
+		for i := range numActors {
 			actor := fmt.Sprintf("echo-%d", i)
 			r, ok := res[actor]
 			if !ok {

codec/registry.go

@@ -22,12 +22,12 @@ var (
 
 var (
 	mu       = &sync.RWMutex{}
-	registry = map[string]interface{}{}
+	registry = map[string]any{}
 )
 
 // Register a type for marshalling and unmarshalling.
 // The type must currently implement proto.Message.
-func Register(v interface{}) error {
+func Register(v any) error {
 	mu.Lock()
 	defer mu.Unlock()
 
@@ -45,9 +45,9 @@ func Register(v interface{}) error {
 	name := TypeName(v)
 	registry[name] = v
 	// TODO(aj) Temporary migration solution for go module upgrade
-	if strings.HasPrefix(name, "github.com/lytics/lio/vendor/") {
+	if after, ok0 := strings.CutPrefix(name, "github.com/lytics/lio/vendor/"); ok0 {
 		// If we're the pre go.mod, register the other namespace
-		otherName := strings.TrimPrefix(name, "github.com/lytics/lio/vendor/")
+		otherName := after
 		registry[otherName] = v
 	} else {
 		// If we're using go.mod, register the old namespace
@@ -59,7 +59,7 @@ func Register(v interface{}) error {
 
 // Marshal the value into bytes. The function returns
 // the type name, the bytes, or an error.
-func Marshal(v interface{}) (string, []byte, error) {
+func Marshal(v any) (string, []byte, error) {
 	mu.RLock()
 	defer mu.RUnlock()
 
@@ -78,7 +78,7 @@ func Marshal(v interface{}) (string, []byte, error) {
 
 // Unmarshal the bytes into a value whos type is given,
 // or return an error.
-func Unmarshal(buf []byte, name string) (interface{}, error) {
+func Unmarshal(buf []byte, name string) (any, error) {
 	mu.RLock()
 	defer mu.RUnlock()
 
@@ -96,7 +96,7 @@ func Unmarshal(buf []byte, name string) (interface{}, error) {
 
 // TypeName of a value. This name is used in the registry
 // to distinguish types.
-func TypeName(v interface{}) string {
+func TypeName(v any) string {
 	rt := reflect.TypeOf(v)
 	pkg := rt.PkgPath()
 	name := rt.Name()
@@ -108,12 +108,12 @@ func TypeName(v interface{}) string {
 	return pkg + "/" + name
 }
 
-func protoMarshal(v interface{}) ([]byte, error) {
+func protoMarshal(v any) ([]byte, error) {
 	pb := v.(proto.Message)
 	return proto.Marshal(pb)
 }
 
-func protoUnmarshal(buf []byte, v interface{}) error {
+func protoUnmarshal(buf []byte, v any) error {
 	pb := v.(proto.Message)
 	return proto.Unmarshal(buf, pb)
 }

go.mod

@@ -1,43 +1,41 @@
 module github.com/lytics/grid/v3
 
-go 1.18
+go 1.23.0
+
+toolchain go1.24.4
 
 require (
 	github.com/lytics/retry v1.2.0
-	github.com/stretchr/testify v1.8.4
-	go.etcd.io/etcd/client/v3 v3.5.7
-	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.44.0
-	google.golang.org/grpc v1.58.0
-	google.golang.org/protobuf v1.31.0
+	github.com/stretchr/testify v1.10.0
+	go.etcd.io/etcd/client/v3 v3.6.1
+	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.62.0
+	google.golang.org/grpc v1.73.0
+	google.golang.org/protobuf v1.36.6
 )
 
 require (
 	github.com/coreos/go-semver v0.3.1 // indirect
 	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/go-logr/logr v1.2.4 // indirect
+	github.com/go-logr/logr v1.4.3 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang/protobuf v1.5.3 // indirect
-	github.com/kr/text v0.2.0 // indirect
-	github.com/pkg/errors v0.9.1 // indirect
+	github.com/golang/protobuf v1.5.4 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	go.etcd.io/etcd/api/v3 v3.5.7 // indirect
-	go.etcd.io/etcd/client/pkg/v3 v3.5.7 // indirect
-	go.opentelemetry.io/otel v1.18.0 // indirect
-	go.opentelemetry.io/otel/metric v1.18.0 // indirect
-	go.opentelemetry.io/otel/trace v1.18.0 // indirect
-	go.uber.org/atomic v1.10.0 // indirect
-	go.uber.org/goleak v1.2.1 // indirect
-	go.uber.org/multierr v1.10.0 // indirect
-	go.uber.org/zap v1.24.0 // indirect
-	golang.org/x/net v0.15.0 // indirect
-	golang.org/x/sys v0.12.0 // indirect
-	golang.org/x/text v0.13.0 // indirect
-	google.golang.org/genproto v0.0.0-20230711160842-782d3b101e98 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
-	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
+	go.etcd.io/etcd/api/v3 v3.6.1 // indirect
+	go.etcd.io/etcd/client/pkg/v3 v3.6.1 // indirect
+	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
+	go.opentelemetry.io/otel v1.37.0 // indirect
+	go.opentelemetry.io/otel/metric v1.37.0 // indirect
+	go.opentelemetry.io/otel/trace v1.37.0 // indirect
+	go.uber.org/multierr v1.11.0 // indirect
+	go.uber.org/zap v1.27.0 // indirect
+	golang.org/x/net v0.41.0 // indirect
+	golang.org/x/sys v0.33.0 // indirect
+	golang.org/x/text v0.26.0 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )