Compute discrete metrics by data source

[mikewilli]

Group discrete metrics by data source to reduce overhead and not repeat the same query multiple times.

┆Issue is synchronized with this Jira Task