Skip to content

MINOR: Use NullNode instead of empty TextNode for missing request/response fields #22295

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chia7712 merged 1 commit into from
May 15, 2026
Merged

MINOR: Use NullNode instead of empty TextNode for missing request/response fields #22295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions core/src/test/scala/unit/kafka/network/RequestConvertToJsonTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package kafka.network

import java.net.InetAddress
import java.nio.ByteBuffer
import com.fasterxml.jackson.databind.node.{BooleanNode, DoubleNode, JsonNodeFactory, LongNode, ObjectNode, TextNode}
import com.fasterxml.jackson.databind.node.{BooleanNode, DoubleNode, JsonNodeFactory, LongNode, NullNode, ObjectNode, TextNode}
import org.apache.kafka.common.memory.MemoryPool
import org.apache.kafka.common.message._
import org.apache.kafka.common.network.{ClientInformation, ListenerName, NetworkSend}
Expand Down Expand Up @@ -58,7 +58,7 @@ class RequestConvertToJsonTest {
val expectedNode = new ObjectNode(JsonNodeFactory.instance)
expectedNode.set("isForwarded", if (req.isForwarded) BooleanNode.TRUE else BooleanNode.FALSE)
expectedNode.set("requestHeader", RequestConvertToJson.requestHeaderNode(req.header))
expectedNode.set("request", req.requestLog.orElse(new TextNode("")))
expectedNode.set("request", req.requestLog.orElse(NullNode.getInstance()))

val actualNode = RequestConvertToJson.requestDesc(req.header, req.requestLog, req.isForwarded)

Expand All @@ -84,7 +84,7 @@ class RequestConvertToJsonTest {
val messageConversionsTimeMs = 9

val expectedNode = RequestConvertToJson.requestDesc(req.header, req.requestLog, req.isForwarded).asInstanceOf[ObjectNode]
expectedNode.set("response", res.responseLog.getOrElse(new TextNode("")))
expectedNode.set("response", res.responseLog.getOrElse(NullNode.getInstance()))
expectedNode.set("connection", new TextNode(req.context.connectionId))
expectedNode.set("totalTimeMs", new DoubleNode(totalTimeMs))
expectedNode.set("requestQueueTimeMs", new DoubleNode(requestQueueTimeMs))
Expand Down
5 changes: 3 additions & 2 deletions server/src/main/java/org/apache/kafka/network/RequestConvertToJson.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,6 +384,7 @@
import com.fasterxml.jackson.databind.node.DoubleNode;
import com.fasterxml.jackson.databind.node.JsonNodeFactory;
import com.fasterxml.jackson.databind.node.LongNode;
import com.fasterxml.jackson.databind.node.NullNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.fasterxml.jackson.databind.node.TextNode;

Expand Down Expand Up @@ -766,7 +767,7 @@ public static JsonNode requestDesc(RequestHeader header, Optional<JsonNode> requ
ObjectNode node = JsonNodeFactory.instance.objectNode();
node.set("isForwarded", isForwarded ? BooleanNode.TRUE : BooleanNode.FALSE);
node.set("requestHeader", requestHeaderNode(header));
node.set("request", requestNode.orElse(new TextNode("")));
node.set("request", requestNode.orElse(NullNode.getInstance()));
return node;
}

Expand All @@ -784,7 +785,7 @@ public static JsonNode requestDescMetrics(RequestHeader header, Optional<JsonNod
double responseSendTimeMs, long temporaryMemoryBytes,
double messageConversionsTimeMs) {
ObjectNode node = (ObjectNode) requestDesc(header, requestNode, isForwarded);
node.set("response", responseNode.orElse(new TextNode("")));
node.set("response", responseNode.orElse(NullNode.getInstance()));
node.set("connection", new TextNode(context.connectionId));
node.set("totalTimeMs", new DoubleNode(totalTimeMs));
node.set("requestQueueTimeMs", new DoubleNode(requestQueueTimeMs));
Expand Down
Loading