xdsclient: only include nodeID in error strings, not the whole nodeProto #5461
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
zasweq
approved these changes
Jun 23, 2022
| @@ -115,9 +115,9 @@ func (wi *watchInfo) sendErrorLocked(err error) { | |||
| errMsg := err.Error() | |||
| errTyp := xdsresource.ErrType(err) | |||
| if errTyp == xdsresource.ErrorTypeUnknown { | |||
| err = fmt.Errorf("%v, xDS client nodeID: %s", errMsg, wi.c.nodeIDJSON) | |||
| err = fmt.Errorf("%v, xDS client nodeID: %s", errMsg, wi.c.nodeID) | |||
There was a problem hiding this comment.
Can you add a test of this error message (only logging nodeID) if not too much effort?
There was a problem hiding this comment.
I had looked into it before sending the PR out as well. It isn't very straightforward and would not be worth the mess. Thanks.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Fixes #5392
RELEASE NOTES: none