Add metrics for rollup vs non-rollup query latency