fix metrics for new internal api