This is an automated email from the ASF dual-hosted git repository.
mimaison pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/kafka.git
The following commit(s) were added to refs/heads/trunk by this push:
new 37b1a075f05 MINOR: Move KafkaMetricsGroupTest from Scala to Java
(#22028)
37b1a075f05 is described below
commit 37b1a075f05ef4bee5ff4a55f3b211a0d8721da3
Author: Ken Huang <[email protected]>
AuthorDate: Tue Apr 14 18:16:03 2026 +0800
MINOR: Move KafkaMetricsGroupTest from Scala to Java (#22028)
Reviewers: Mickael Maison <[email protected]>
---
.../unit/kafka/metrics/KafkaMetricsGroupTest.scala | 79 ----------------------
.../server/metrics/KafkaMetricsGroupTest.java | 55 +++++++++++++--
2 files changed, 48 insertions(+), 86 deletions(-)
diff --git a/core/src/test/scala/unit/kafka/metrics/KafkaMetricsGroupTest.scala
b/core/src/test/scala/unit/kafka/metrics/KafkaMetricsGroupTest.scala
deleted file mode 100644
index b0dbd0a05c2..00000000000
--- a/core/src/test/scala/unit/kafka/metrics/KafkaMetricsGroupTest.scala
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * 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.metrics
-
-import org.apache.kafka.server.metrics.KafkaMetricsGroup
-
-import org.junit.jupiter.api.Assertions.{assertEquals, assertNull}
-import org.junit.jupiter.api.Test
-
-class KafkaMetricsGroupTest {
-
- @Test
- def testUntaggedMetricName(): Unit = {
- val metricsGroup = new KafkaMetricsGroup("kafka.metrics", "TestMetrics")
- val metricName = metricsGroup.metricName("TaggedMetric", java.util.Map.of)
-
- assertEquals("kafka.metrics", metricName.getGroup)
- assertEquals("TestMetrics", metricName.getType)
- assertEquals("TaggedMetric", metricName.getName)
- assertEquals("kafka.metrics:type=TestMetrics,name=TaggedMetric",
- metricName.getMBeanName)
- assertNull(metricName.getScope)
- }
-
- @Test
- def testTaggedMetricName(): Unit = {
- val tags = {
- val map = new java.util.LinkedHashMap[String, String]()
- map.put("foo", "bar")
- map.put("bar", "baz")
- map.put("baz", "raz.taz")
- map
- }
- val metricsGroup = new KafkaMetricsGroup("kafka.metrics", "TestMetrics")
- val metricName = metricsGroup.metricName("TaggedMetric", tags)
-
- assertEquals("kafka.metrics", metricName.getGroup)
- assertEquals("TestMetrics", metricName.getType)
- assertEquals("TaggedMetric", metricName.getName)
-
assertEquals("kafka.metrics:type=TestMetrics,name=TaggedMetric,foo=bar,bar=baz,baz=raz.taz",
- metricName.getMBeanName)
- assertEquals("bar.baz.baz.raz_taz.foo.bar", metricName.getScope)
- }
-
- @Test
- def testTaggedMetricNameWithEmptyValue(): Unit = {
- val tags = {
- val map = new java.util.LinkedHashMap[String, String]()
- map.put("foo", "bar")
- map.put("bar", "")
- map.put("baz", "raz.taz")
- map
- }
- val metricsGroup = new KafkaMetricsGroup("kafka.metrics", "TestMetrics")
- val metricName = metricsGroup.metricName("TaggedMetric", tags)
-
- assertEquals("kafka.metrics", metricName.getGroup)
- assertEquals("TestMetrics", metricName.getType)
- assertEquals("TaggedMetric", metricName.getName)
-
assertEquals("kafka.metrics:type=TestMetrics,name=TaggedMetric,foo=bar,baz=raz.taz",
- metricName.getMBeanName)
- assertEquals("baz.raz_taz.foo.bar", metricName.getScope)
- }
-}
diff --git
a/server-common/src/test/java/org/apache/kafka/server/metrics/KafkaMetricsGroupTest.java
b/server-common/src/test/java/org/apache/kafka/server/metrics/KafkaMetricsGroupTest.java
index f3d55c18469..d65d3b7797d 100644
---
a/server-common/src/test/java/org/apache/kafka/server/metrics/KafkaMetricsGroupTest.java
+++
b/server-common/src/test/java/org/apache/kafka/server/metrics/KafkaMetricsGroupTest.java
@@ -20,18 +20,59 @@ import com.yammer.metrics.core.MetricName;
import org.junit.jupiter.api.Test;
+import java.util.LinkedHashMap;
import java.util.Map;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
public class KafkaMetricsGroupTest {
+
+ @Test
+ public void testUntaggedMetricName() {
+ KafkaMetricsGroup metricsGroup = new
KafkaMetricsGroup("kafka.metrics", "TestMetrics");
+ MetricName metricName = metricsGroup.metricName("TaggedMetric",
Map.of());
+
+ assertEquals("kafka.metrics", metricName.getGroup());
+ assertEquals("TestMetrics", metricName.getType());
+ assertEquals("TaggedMetric", metricName.getName());
+ assertEquals("kafka.metrics:type=TestMetrics,name=TaggedMetric",
metricName.getMBeanName());
+ assertNull(metricName.getScope());
+ }
+
+ @Test
+ public void testTaggedMetricName() {
+ LinkedHashMap<String, String> tags = new LinkedHashMap<>();
+ tags.put("foo", "bar");
+ tags.put("bar", "baz");
+ tags.put("baz", "raz.taz");
+
+ KafkaMetricsGroup metricsGroup = new
KafkaMetricsGroup("kafka.metrics", "TestMetrics");
+ MetricName metricName = metricsGroup.metricName("TaggedMetric", tags);
+
+ assertEquals("kafka.metrics", metricName.getGroup());
+ assertEquals("TestMetrics", metricName.getType());
+ assertEquals("TaggedMetric", metricName.getName());
+
assertEquals("kafka.metrics:type=TestMetrics,name=TaggedMetric,foo=bar,bar=baz,baz=raz.taz",
+ metricName.getMBeanName());
+ assertEquals("bar.baz.baz.raz_taz.foo.bar", metricName.getScope());
+ }
+
@Test
- public void testConstructorWithPackageAndSimpleName() {
- String packageName = "testPackage";
- String simpleName = "testSimple";
- KafkaMetricsGroup group = new KafkaMetricsGroup(packageName,
simpleName);
- MetricName metricName = group.metricName("metric-name", Map.of());
- assertEquals(packageName, metricName.getGroup());
- assertEquals(simpleName, metricName.getType());
+ public void testTaggedMetricNameWithEmptyValue() {
+ LinkedHashMap<String, String> tags = new LinkedHashMap<>();
+ tags.put("foo", "bar");
+ tags.put("bar", "");
+ tags.put("baz", "raz.taz");
+
+ KafkaMetricsGroup metricsGroup = new
KafkaMetricsGroup("kafka.metrics", "TestMetrics");
+ MetricName metricName = metricsGroup.metricName("TaggedMetric", tags);
+
+ assertEquals("kafka.metrics", metricName.getGroup());
+ assertEquals("TestMetrics", metricName.getType());
+ assertEquals("TaggedMetric", metricName.getName());
+
assertEquals("kafka.metrics:type=TestMetrics,name=TaggedMetric,foo=bar,baz=raz.taz",
+ metricName.getMBeanName());
+ assertEquals("baz.raz_taz.foo.bar", metricName.getScope());
}
}
