The 51-year-old can be ordered to deliver food and drink to guest rooms at Hotel Indigo between Thursday, April 19 and Saturday, April 21.
She told STV: "I've done comedy acts in lots of different places but being part of a room service menu is a first for me."
Godley added: "I love that people at Hotel Indigo Edinburgh can ring up to order their room service and then the next moment, I'll be in their room telling jokes and doing my act.
"As a local comedian I think it's great that guests can enjoy a bit of live comedy in the city that is home to the world-famous Fringe festival while they enjoy dinner and sip a glass of wine in the comfort of their own room."
Hotel manager Dominic Kutschera commented: "Edinburgh plays host to the world's largest arts festival every summer and as a result Edinburgh has become synonymous with comedy.
"The festival theme is reflected throughout our hotel and we thought it would be fun to take this a step further by putting comedy quite literally on the menu."
> Hotels to combat towel theft with electric tags
> Man opens hotel for chickens