address feedback

Author: makramkd

pkg/loop/internal/net/client.go

@@ -89,12 +89,11 @@ func (c *clientConn) Invoke(ctx context.Context, method string, args any, reply
 				// connect in order to not block the caller indefinitely.
 				// If for whatever reason the LOOPP is down the caller should retry whatever
 				// call they were making.
-				c.Logger.Warnw("clientConn: Invoke: context canceled, stopping refresh",
+				c.Logger.Warnw("clientConn: Invoke: context done, stopping refresh",
 					"method", method,
 					"err", err,
 					"ctxErr", ctx.Err())
-				// TODO: also return ctx.Err()?
-				return err
+				return ctx.Err()
 			}
 			if method == pb.Service_Close_FullMethodName {
 				// don't reconnect just to call Close
@@ -128,12 +127,11 @@ func (c *clientConn) NewStream(ctx context.Context, desc *grpc.StreamDesc, metho
 				// connect in order to not block the caller indefinitely.
 				// If for whatever reason the LOOPP is down the caller should retry whatever
 				// call they were making.
-				c.Logger.Warnw("clientConn: NewStream: context canceled, stopping refresh",
+				c.Logger.Warnw("clientConn: NewStream: context done, stopping refresh",
 					"method", method,
 					"err", err,
 					"ctxErr", ctx.Err())
-				// TODO: also return ctx.Err()?
-				return s, err
+				return s, ctx.Err()
 			}
 			c.Logger.Errorw("clientConn: NewStream: terminal error, refreshing connection", "err", err)
 			cc, refErr = c.refresh(ctx, cc)

pkg/loop/internal/net/client_lifecycle_test.go

@@ -90,8 +90,7 @@ func TestClient_Lifecycle(t *testing.T) {
 
 		// This call should return Canceled immediately and NOT trigger refresh.
 		err = setup.Invoke(ctxCancelled, "/Service/Foo", nil, nil)
-
-		require.Equal(t, codes.Canceled, status.Code(err))
+		require.ErrorIs(t, err, context.Canceled)
 
 		// If the bug exists, newClientFn will be called AGAIN (incrementing to 2).
 		// If fixed, it should remain 1.
@@ -136,7 +135,7 @@ func TestClient_Lifecycle(t *testing.T) {
 		stream, err := setup.NewStream(ctxCancelled, &grpc.StreamDesc{StreamName: "Foo", ClientStreams: true, ServerStreams: true}, "/Service/Foo")
 
 		require.Error(t, err)
-		require.Equal(t, codes.Canceled, status.Code(err))
+		require.ErrorIs(t, err, context.Canceled)
 		require.Nil(t, stream)
 
 		require.Equal(t, 1, setup.newClientCalls, "Should NOT refresh connection on NewStream context cancellation")