Re-architecting metrics collection to include TSDB