Move metrics into Faraday tap