From 57d6a881ca00afc81f6df104e2c51161cf7de44a Mon Sep 17 00:00:00 2001 From: Federico Valeri Date: Mon, 17 Apr 2023 14:59:35 +0200 Subject: [PATCH] MINOR: Add JmxTool wrapper scripts and redirection (KIP-906) (#13195) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewers: Mickael Maison 

, 
David Jacot , Christo Lolov , Alexandre Dupriez --- bin/kafka-jmx.sh | 17 ++++++++++ bin/windows/kafka-jmx.bat | 17 ++++++++++ core/src/main/scala/kafka/tools/JmxTool.scala | 29 ++++++++++++++++ docs/upgrade.html | 34 +++++++++++-------- 4 files changed, 83 insertions(+), 14 deletions(-) create mode 100755 bin/kafka-jmx.sh create mode 100644 bin/windows/kafka-jmx.bat create mode 100644 core/src/main/scala/kafka/tools/JmxTool.scala diff --git a/bin/kafka-jmx.sh b/bin/kafka-jmx.sh new file mode 100755 index 00000000000..88b387485de --- /dev/null +++ b/bin/kafka-jmx.sh @@ -0,0 +1,17 @@ +#!/bin/bash +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +exec $(dirname $0)/kafka-run-class.sh org.apache.kafka.tools.JmxTool "$@" diff --git a/bin/windows/kafka-jmx.bat b/bin/windows/kafka-jmx.bat new file mode 100644 index 00000000000..72eb8faec9b --- /dev/null +++ b/bin/windows/kafka-jmx.bat @@ -0,0 +1,17 @@ +@echo off +rem Licensed to the Apache Software Foundation (ASF) under one or more +rem contributor license agreements. See the NOTICE file distributed with +rem this work for additional information regarding copyright ownership. +rem The ASF licenses this file to You under the Apache License, Version 2.0 +rem (the "License"); you may not use this file except in compliance with +rem the License. You may obtain a copy of the License at +rem +rem http://www.apache.org/licenses/LICENSE-2.0 +rem +rem Unless required by applicable law or agreed to in writing, software +rem distributed under the License is distributed on an "AS IS" BASIS, +rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +rem See the License for the specific language governing permissions and +rem limitations under the License. + +"%~dp0kafka-run-class.bat" org.apache.kafka.tools.JmxTool %* diff --git a/core/src/main/scala/kafka/tools/JmxTool.scala b/core/src/main/scala/kafka/tools/JmxTool.scala new file mode 100644 index 00000000000..90ffb510aed --- /dev/null +++ b/core/src/main/scala/kafka/tools/JmxTool.scala @@ -0,0 +1,29 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package kafka.tools + +@deprecated(since = "3.5") +object JmxTool { + def main(args: Array[String]): Unit = { + println("WARNING: The 'kafka.tools' package is deprecated and will change to 'org.apache.kafka.tools' in the next major release.") + val toolClass = Class.forName("org.apache.kafka.tools.JmxTool") + val toolMethod = toolClass.getDeclaredMethod("main", classOf[Array[String]]) + toolMethod.invoke(null, args) + } +} diff --git a/docs/upgrade.html b/docs/upgrade.html index 4d979a02612..15ddca52078 100644 --- a/docs/upgrade.html +++ b/docs/upgrade.html @@ -19,20 +19,26 @@