take constructor approach instead of callback

Author: ogtownsend

pkg/loop/internal/net/broker.go

@@ -83,16 +83,6 @@ func (b *BrokerExt) NewClientConn(name string, newClient newClientFn) *clientCon
 	}
 }
 
-// NewClientConnWithCallback return a new *clientConn backed by this *BrokerExt with a refresh callback.
-func (b *BrokerExt) NewClientConnWithCallback(name string, newClient newClientFn, refreshCallback RefreshCallback) *clientConn {
-	return &clientConn{
-		BrokerExt:       b.WithName(name),
-		newClient:       newClient,
-		name:            name,
-		refreshCallback: refreshCallback,
-	}
-}
-
 func (b *BrokerExt) StopCtx() (context.Context, context.CancelFunc) {
 	return utils.ContextFromChan(b.StopCh)
 }

pkg/loop/internal/net/client.go

@@ -35,10 +35,6 @@ var _ grpc.ClientConnInterface = (*clientConn)(nil)
 // newClientFn returns a new client connection id to dial, and a set of Resource dependencies to close.
 type newClientFn func(context.Context) (id uint32, deps Resources, err error)
 
-// RefreshCallback is called after a successful refresh, but before the connection is made available.
-// This allows clients to perform state management operations before the refreshed client is used again.
-type RefreshCallback func(ctx context.Context) error
-
 // clientConn is a [grpc.ClientConnInterface] backed by a [*grpc.ClientConn] which can be recreated and swapped out
 // via the provided [newClientFn].
 // New instances should be created via BrokerExt.NewClientConn.
@@ -47,10 +43,9 @@ type clientConn struct {
 	newClient newClientFn
 	name      string
 
-	mu              sync.RWMutex
-	deps            Resources
-	cc              *grpc.ClientConn
-	refreshCallback RefreshCallback
+	mu   sync.RWMutex
+	deps Resources
+	cc   *grpc.ClientConn
 }
 
 func (c *clientConn) Invoke(ctx context.Context, method string, args interface{}, reply interface{}, opts ...grpc.CallOption) error {
@@ -155,12 +150,5 @@ func (c *clientConn) refresh(ctx context.Context, orig *grpc.ClientConn) *grpc.C
 		}
 	}
 
-	if c.refreshCallback != nil {
-		if err := c.refreshCallback(ctx); err != nil {
-			// Log error but make the refreshed connection available anyway.
-			c.Logger.Errorw("Refresh callback failed", "err", err)
-		}
-	}
-
 	return c.cc
 }