Revamp metrics-jdbi.