I really think we should have only one method getMetrics(String tenantId, String query); We should construct the query suitably instead of this checking for "*". Wdyt?