From cf4e29ce20b7b78d12dd966352998bb32338018f Mon Sep 17 00:00:00 2001 From: Yu Ning <78631860+Chillax-0v0@users.noreply.github.com> Date: Thu, 11 Apr 2024 16:12:31 +0800 Subject: [PATCH] chore(util): print commit id when calling scripts wich "--version" as it used to be (#1110) Signed-off-by: Ning Yu --- .../java/org/apache/kafka/common/utils/AppInfoParser.java | 6 ++++++ .../java/org/apache/kafka/server/util/CommandLineUtils.java | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/clients/src/main/java/org/apache/kafka/common/utils/AppInfoParser.java b/clients/src/main/java/org/apache/kafka/common/utils/AppInfoParser.java index 46ffdd6743..eef914e0ff 100644 --- a/clients/src/main/java/org/apache/kafka/common/utils/AppInfoParser.java +++ b/clients/src/main/java/org/apache/kafka/common/utils/AppInfoParser.java @@ -57,6 +57,12 @@ public static String getCommitId() { return COMMIT_ID; } + // AutoMQ inject start + public static String getVersionString() { + return String.format("%s (Commit:%s)", getVersion(), getCommitId()); + } + // AutoMQ inject end + public static synchronized void registerAppInfo(String prefix, String id, Metrics metrics, long nowMs) { try { ObjectName name = new ObjectName(prefix + ":type=app-info,id=" + Sanitizer.jmxSanitize(id)); diff --git a/server-common/src/main/java/org/apache/kafka/server/util/CommandLineUtils.java b/server-common/src/main/java/org/apache/kafka/server/util/CommandLineUtils.java index e51f6cd321..51ffe65a32 100644 --- a/server-common/src/main/java/org/apache/kafka/server/util/CommandLineUtils.java +++ b/server-common/src/main/java/org/apache/kafka/server/util/CommandLineUtils.java @@ -140,7 +140,9 @@ public static void printUsageAndExit(OptionParser parser, String message) { } public static void printVersionAndExit() { - System.out.println(AppInfoParser.getVersion()); + // AutoMQ inject start + System.out.println(AppInfoParser.getVersionString()); + // AutoMQ inject end Exit.exit(0); }