Fix how metrics are emitted from servermanager
fix naming
add missing final
address cr
Merge pull request #659 from metamx/fix-metrics

Separate query metrics into scan/time and query/time