Port changes from sigmod branch: drain the metric queue

[github-actions[bot]]

^{( % to main) ( % to main)}