chore: simplify metrics-only blocks #5952
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Does minor refactoring of metrics-only blocks to make the analyzer happy.
Motivation and Context
Recent work in #5944 makes metrics a non-default feature. This made the analyzer unhappy due to some unused variables, but it turns out this can be fixed while simplifying some of the handling of metrics-only blocks. This PR makes these changes and keeps the analyzer happy.
How Has This Been Tested?
Existing tests pass.
What process can a PR reviewer use to test or verify this change?
Check that the new metrics-only block handling is identical to that introduced by #5944.