Test fix for missing metrics#10013

leftwo wants to merge 4 commits intomainoxidecomputer/omicron:mainfrom

alan/test-wip-discardoxidecomputer/omicron:alan/test-wip-discardCopy head branch name to clipboard