Code complete on FSBroker metrics collection