Fix: Enhance queue management by adding retry logic and metrics (#2442)

Fix: Enhance queue management by adding retry logic and metrics (#2442) #304