Fix #14414: resilient_server metrics name/prefix logic is inverted, leading to no metrics being recorded

[aquarapid]

Description

The logic for the topo resilient server has been apparently broken since it was introduced. I fixed a single test that was mis-named, that led to a panic with this change. I would like to test that the name of the metric is now correct, but the stats module does not make that easy, so something like an end-to-end test would be required, and I do not think this fix justifies that level of effort.

Unnecessary to backport, affects metrics only.

Related Issues

• Fixes: Bug Report: resilient_server metrics name/prefix logic is inverted, leading to no metrics being recorded #14414

Checklist

• "Backport to:" labels have been added if this change should be back-ported
• Tests were added or are not required
• Did the new or modified tests pass consistently locally and on the CI
• Documentation was added or is not required

[vitess-bot]

Review Checklist

Hello reviewers! 👋 Please follow this checklist when reviewing this Pull Request.

General

• Ensure that the Pull Request has a descriptive title.
• Ensure there is a link to an issue (except for internal cleanup and flaky test fixes), new features should have an RFC that documents use cases and test cases.

Tests

• Bug fixes should have at least one unit or end-to-end test, enhancement and new features should have a sufficient number of tests.

Documentation

• Apply the release notes (needs details) label if users need to know about this change.
• New features should be documented.
• There should be some code comments as to why things are implemented the way they are.
• There should be a comment at the top of each new or modified test to explain what the test does.

New flags

• Is this flag really necessary?
• Flag names must be clear and intuitive, use dashes (-), and have a clear help text.

If a workflow is added or modified:

• Each item in Jobs should be named in order to mark it as required.
• If the workflow needs to be marked as required, the maintainer team must be notified.

Backward compatibility

• Protobuf changes should be wire-compatible.
• Changes to _vt tables and RPCs need to be backward compatible.
• RPC changes should be compatible with vitess-operator
• If a flag is removed, then it should also be removed from vitess-operator and arewefastyet, if used there.
• vtctl command output order should be stable and awk-able.

[harshit-gangal]

nit: the else can be removed.

[harshit-gangal]

good find. A small comment for cleanup.
Looks good.

[dbussink]

There's a test failure here, does the test also expect the incorrect case?

--- FAIL: TestVStreamsCreatedAndLagMetrics (0.00s)
    vstream_manager_test.go:386: 
        	Error Trace:	/home/runner/work/vitess/vitess/go/vt/vtgate/vstream_manager_test.go:386
        	Error:      	Not equal: 
        	            	expected: map[string]int64{"TestVStream.-20.PRIMARY":5, "TestVStream.20-40.PRIMARY":7}
        	            	actual  : map[string]int64{"TestVStream.-20.PRIMARY":5, "TestVStream.20-40.PRIMARY":0}
        	            	
        	            	Diff:
        	            	--- Expected
        	            	+++ Actual
        	            	@@ -2,3 +2,3 @@
        	            	  (string) (len=23) "TestVStream.-20.PRIMARY": (int64) 5,
        	            	- (string) (len=25) "TestVStream.20-40.PRIMARY": (int64) 7
        	            	+ (string) (len=25) "TestVStream.20-40.PRIMARY": (int64) 0
        	            	 }
        	Test:       	TestVStreamsCreatedAndLagMetrics
        	Messages:   	vstreamsLag matches

[deepthi]

Just leaving a note for any others who see this that I'm going to pick this up and fix the tests.