Added custom query metric service.  Also added relevant javadocs to all metrics interfaces.  Finally removed buggy old implementation