Merge "Added OpenTelemetry to CPS"