* Refactor analysis benchmark and collect more data (#20169)

This does some code cleanup to avoid duplication, improves the logs,
and records min and max values as well as the mean.

* Fix typo that led to infinite loop