Add metrictype to datapoint

Summary:
It's optional, so doesn't use any more space unless
set.  This is part of my goal of removing preregistration