Sonar evd spike

[bhanurp]

• [ ] All tests have passed. If this feature is not already covered by the tests, new tests have been added.
• [ ] The pull request is targeting the dev branch.
• [ ] The code has been validated to compile successfully by running go vet ./....
• [ ] The code has been formatted properly using go fmt ./....

---