[Backport 2.5] Merge pull request #588 from mengweieric/feature/prerelease-code-cleanup

[mengweieric]

(cherry picked from commit a85b716)

Description

[Describe what this change achieves]

Issues Resolved

[List any issues this PR will resolve]

Check List

• New functionality includes testing.
  • All tests pass, including unit test, integration test and doctest
• New functionality has been documented.
  • New functionality has javadoc added
  • New functionality has user manual doc added
• Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

[codecov]

Codecov Report

Merging #599 (896c390) into 2.5 (8f52064) will increase coverage by 0.18%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##              2.5     #599      +/-   ##
==========================================
+ Coverage   38.04%   38.22%   +0.18%     
==========================================
  Files         260      255       -5     
  Lines       15833    15805      -28     
  Branches     4312     4299      -13     
==========================================
+ Hits         6023     6042      +19     
+ Misses       9769     9714      -55     
- Partials       41       49       +8     

Flag	Coverage Δ
dashboards-observability	38.22% <ø> (+0.18%)	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

see 24 files with indirect coverage changes