- Set measurement behind featue flag for each service
- Remove optional params for measurement
- Fix specs