Two methods that do the same thing vs one? I'm not sure I follow you on how that would be better.

`tenant` is an optional field in `BasicMetric` during input, but __must__ be there prior to writing to the database. The null-check-add-default needs to be there always.