clean up unused utils

logger/logger.go

@@ -379,7 +379,7 @@ func (l *zapLogger[T]) WithoutSampler() Logger {
 func (l *zapLogger[T]) WithDeferredValues() (Logger, DeferredFieldResolver) {
 	dup := *l
 	def, resolve := zaputil.NewDeferrer()
-	dup.deferred = append(dup.deferred[0:len(dup.deferred):len(dup.deferred)], def)
+	dup.deferred = append(dup.deferred, def)
 	dup.zap = dup.ToZap()
 	return &dup, resolve
 }

logger/slog.go

@@ -27,11 +27,11 @@ func ToSlogHandler(log Logger) slog.Handler {
 
 type slogDiscard struct{}
 
-func (_ slogDiscard) Enabled(ctx context.Context, level slog.Level) bool {
+func (slogDiscard) Enabled(ctx context.Context, level slog.Level) bool {
 	return false
 }
 
-func (_ slogDiscard) Handle(ctx context.Context, record slog.Record) error {
+func (slogDiscard) Handle(ctx context.Context, record slog.Record) error {
 	return nil
 }
 

rpc/typed_api.go

@@ -22,7 +22,6 @@ import (
 	"github.com/livekit/protocol/livekit"
 	"github.com/livekit/protocol/logger"
 	"github.com/livekit/protocol/utils/must"
-	"github.com/livekit/protocol/utils/options"
 	"github.com/livekit/psrpc"
 	"github.com/livekit/psrpc/pkg/middleware"
 )
@@ -84,26 +83,18 @@ func (p *ClientParams) Options() []psrpc.ClientOption {
 }
 
 func (p *ClientParams) Args() (psrpc.MessageBus, psrpc.ClientOption) {
-	return p.Bus, WithClientOptions(p.Options()...)
-}
-
-func WithClientOptions(opts ...psrpc.ClientOption) psrpc.ClientOption {
-	return func(o *psrpc.ClientOpts) { options.Apply(o, opts) }
-}
-
-func WithServerOptions(opts ...psrpc.ServerOption) psrpc.ServerOption {
-	return func(o *psrpc.ServerOpts) { options.Apply(o, opts) }
+	return p.Bus, psrpc.WithClientOptions(p.Options()...)
 }
 
 func WithServerObservability(logger logger.Logger) psrpc.ServerOption {
-	return WithServerOptions(
+	return psrpc.WithServerOptions(
 		middleware.WithServerMetrics(PSRPCMetricsObserver{}),
 		WithServerLogger(logger),
 	)
 }
 
 func WithDefaultServerOptions(psrpcConfig PSRPCConfig, logger logger.Logger) psrpc.ServerOption {
-	return WithServerOptions(
+	return psrpc.WithServerOptions(
 		psrpc.WithServerChannelSize(psrpcConfig.BufferSize),
 		WithServerObservability(logger),
 	)

utils/options/options.go

@@ -20,3 +20,13 @@ func Apply[T any, F ~func(T)](o T, opts []F) T {
 	}
 	return o
 }
+
+func Make[T any, F ~func(*T)](opts []F) T {
+	var o T
+	Apply(&o, opts)
+	return o
+}
+
+func New[T any, F ~func(*T)](opts []F) *T {
+	return Apply(new(T), opts)
+}

utils/protoproxy.go

@@ -86,7 +86,7 @@ func (p *ProtoProxy[T]) Updated() <-chan struct{} {
 func (p *ProtoProxy[T]) Get() T {
 	p.lock.RLock()
 	defer p.lock.RUnlock()
-	return proto.Clone(p.message).(T)
+	return CloneProto(p.message)
 }
 
 func (p *ProtoProxy[T]) Stop() {