[4.x] Move fetch of metrics from endpoint so it too is retried#5143