Moves into client/resolver so that we can manage the life-cycle of the gauge with the shard it is measuring
This change is