From 74585b5ae07a5ab10d85f9a8bc80e3093b7cff20 Mon Sep 17 00:00:00 2001 From: atomchen <492672043@qq.com> Date: Thu, 21 Mar 2024 18:29:53 +0800 Subject: [PATCH] [improve][cli] CmdConsume print publishTime And eventTime info. (#22308) Co-authored-by: atomchchen --- .../org/apache/pulsar/client/cli/AbstractCmdConsume.java | 3 +++ .../pulsar/tests/integration/cli/ClientToolTest.java | 7 ++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/client/cli/AbstractCmdConsume.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/client/cli/AbstractCmdConsume.java index a7932c732eb81..658b34767b594 100644 --- a/pulsar-client-tools/src/main/java/org/apache/pulsar/client/cli/AbstractCmdConsume.java +++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/client/cli/AbstractCmdConsume.java @@ -108,6 +108,9 @@ protected String interpretMessage(Message message, boolean displayHex) throws data = value.toString(); } + sb.append("publishTime:[").append(message.getPublishTime()).append("], "); + sb.append("eventTime:[").append(message.getEventTime()).append("], "); + String key = null; if (message.hasKey()) { key = message.getKey(); diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/ClientToolTest.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/ClientToolTest.java index 571948443b142..0d6b6f1abe4cf 100644 --- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/ClientToolTest.java +++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/ClientToolTest.java @@ -86,13 +86,14 @@ private List consume(ChaosContainer container, String url, String top + "\nError output:\n" + result.getStderr()); } String output = result.getStdout(); - Pattern message = Pattern.compile("----- got message -----\nkey:\\[null\\], properties:\\[\\], content:(.*)"); + Pattern message = Pattern.compile( + "----- got message -----\npublishTime:\\[(.*)\\], eventTime:\\[(.*)\\], key:\\[null\\], " + + "properties:\\[\\], content:(.*)"); Matcher matcher = message.matcher(output); List received = new ArrayList<>(MESSAGE_COUNT); while (matcher.find()) { - received.add(matcher.group(1)); + received.add(matcher.group(3)); } return received; } - }