Moved metric_id to payload in event