monitor plus clean up (fix #16883)

[wen-2018]

If this changeset needs to go into the FXC codebase, please add the WMO and FXC label.

One-line summary

Significant changes and points to review

See details in Jira

Issue / Bugzilla link

#16883

Testing

[codecov]

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 80.01%. Comparing base (26efac8) to head (001635e).

Additional details and impacted files

@@           Coverage Diff           @@
##             main   #16884   +/-   ##
=======================================
  Coverage   80.00%   80.01%           
=======================================
  Files         161      161           
  Lines        8778     8761   -17     
=======================================
- Hits         7023     7010   -13     
+ Misses       1755     1751    -4     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

• ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
• 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.