Stop throwing errors on blank log messages #17058
Draft
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
|
|
sudo-cody
reviewed
Nov 16, 2023
| } | ||
| } else if (!messageNode.isMissingNode()) { | ||
| if (!messageNode.isTextual()) { | ||
| throw new IllegalArgumentException(prefix + "has invalid \"message\": " + messageNode.asText()); | ||
| } | ||
| if (StringUtils.isBlank(messageNode.asText())) { | ||
| throw new IllegalArgumentException(prefix + "has empty mandatory \"message\" field."); | ||
| if (message == null) { |
There was a problem hiding this comment.
Should this not be if (messageNode.asText() == null)? And, can it be null at all now we know messageNode is textual?
sudo-cody
reviewed
Nov 16, 2023
| if (!shortMessageNode.isMissingNode()) { | ||
| if (!shortMessageNode.isTextual()) { | ||
| throw new IllegalArgumentException(prefix + "has invalid \"short_message\": " + shortMessageNode.asText()); | ||
| } | ||
| if (StringUtils.isBlank(shortMessageNode.asText()) && StringUtils.isBlank(messageNode.asText())) { | ||
| throw new IllegalArgumentException(prefix + "has empty mandatory \"short_message\" field."); | ||
| String shortMessage = shortMessageNode.asText(); |
There was a problem hiding this comment.
This is the same as message, isn't it? And, can it be null now we know that shortMessageNode is textual?
sudo-cody
reviewed
Nov 16, 2023
| @@ -255,19 +255,21 @@ private void validateGELFMessage(JsonNode jsonNode, UUID id, ResolvableInetSocke | |||
|
|
|||
| final JsonNode shortMessageNode = jsonNode.path("short_message"); | |||
| final JsonNode messageNode = jsonNode.path("message"); | |||
| String message = shortMessageNode.asText(); | |||
There was a problem hiding this comment.
This line can be removed, as far as I can see.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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
Blank log messages should not generating errors. When a client sends a blank log message it should be processed like all other messages.
Motivation and Context
Fixes #5793
Related to docker/for-linux#354 and fluent/fluentd-kubernetes-daemonset#243