reorder the metric names
add in socket support