Err, when I said "include the source as is" I meant, attach the source as a property on the event.  Then, in post-processing, we take the "source" field and remove whatever was in it from the metric name.