[backport-1.6]: MR "Dump few more metrics in debug archive" needs a 1.6.x backport

MR !7067 (merged) needs to be backported to 1.6.x