root
/
kafka
mirror of https://github.com/apache/kafka.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

MINOR: Fix EventQueueProcessingTimeMs metric #11668 

Make sure that the event queue processing time histogram gets updated
and add tests that verify that the update methods modify the correct
histogram.

Reviewers: Colin P. McCabe <cmccabe@apache.org>
This commit is contained in:
José Armando García Sancio 2022-01-11 22:48:39 -07:00 committed by GitHub
parent c182a431d2
commit 1aa26faf88
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 58 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
metadata/src/main/java/org/apache/kafka/controller/QuorumControllerMetrics.java
View File

@ -135,7 +135,7 @@ public final class QuorumControllerMetrics implements ControllerMetrics {
@Override @Override
public void updateEventQueueProcessingTime(long durationMs) { public void updateEventQueueProcessingTime(long durationMs) {
eventQueueTime.update(durationMs); eventQueueProcessingTime.update(durationMs);
} }
@Override @Override

82
metadata/src/test/java/org/apache/kafka/controller/QuorumControllerMetricsTest.java
View File

@ -17,13 +17,14 @@
package org.apache.kafka.controller; package org.apache.kafka.controller;
import com.yammer.metrics.core.Histogram;
import com.yammer.metrics.core.MetricName;
import com.yammer.metrics.core.MetricsRegistry; import com.yammer.metrics.core.MetricsRegistry;
import java.util.Set;
import org.apache.kafka.common.utils.Utils; import org.apache.kafka.common.utils.Utils;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.util.Set;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.assertTrue;
public class QuorumControllerMetricsTest { public class QuorumControllerMetricsTest {
@ -49,36 +50,67 @@ public class QuorumControllerMetricsTest {
assertMetricsCreatedAndRemovedUponClose(expectedType, expectedMetricNames); assertMetricsCreatedAndRemovedUponClose(expectedType, expectedMetricNames);
} }
@Test
public void testUpdateEventQueueTime() {
MetricsRegistry registry = new MetricsRegistry();
try {
try (QuorumControllerMetrics quorumControllerMetrics = new QuorumControllerMetrics(registry)) {
quorumControllerMetrics.updateEventQueueTime(1000);
assertMetricHistogram(registry, metricName("ControllerEventManager", "EventQueueTimeMs"), 1, 1000);
}
} finally {
registry.shutdown();
}
}
@Test
public void testUpdateEventQueueProcessingTime() {
MetricsRegistry registry = new MetricsRegistry();
try {
try (QuorumControllerMetrics quorumControllerMetrics = new QuorumControllerMetrics(registry)) {
quorumControllerMetrics.updateEventQueueProcessingTime(1000);
assertMetricHistogram(registry, metricName("ControllerEventManager", "EventQueueProcessingTimeMs"), 1, 1000);
}
} finally {
registry.shutdown();
}
}
private static void assertMetricsCreatedAndRemovedUponClose(String expectedType, Set<String> expectedMetricNames) { private static void assertMetricsCreatedAndRemovedUponClose(String expectedType, Set<String> expectedMetricNames) {
MetricsRegistry registry = new MetricsRegistry(); MetricsRegistry registry = new MetricsRegistry();
try (QuorumControllerMetrics quorumControllerMetrics = new QuorumControllerMetrics(registry)) { try {
assertMetricsCreated(registry, expectedMetricNames, expectedType); try (QuorumControllerMetrics quorumControllerMetrics = new QuorumControllerMetrics(registry)) {
assertMetricsCreated(registry, expectedMetricNames, expectedType);
}
assertMetricsRemoved(registry, expectedMetricNames, expectedType);
} finally {
registry.shutdown();
} }
assertMetricsRemoved(registry, expectedMetricNames, expectedType); }
private static void assertMetricHistogram(MetricsRegistry registry, MetricName metricName, long count, double sum) {
Histogram histogram = (Histogram) registry.allMetrics().get(metricName);
assertEquals(count, histogram.count());
assertEquals(sum, histogram.sum(), .1);
}
private static MetricName metricName(String type, String name) {
String mBeanName = String.format("kafka.controller:type=%s,name=%s", type, name);
return new MetricName("kafka.controller", type, name, null, mBeanName);
} }
private static void assertMetricsCreated(MetricsRegistry registry, Set<String> expectedMetricNames, String expectedType) { private static void assertMetricsCreated(MetricsRegistry registry, Set<String> expectedMetricNames, String expectedType) {
expectedMetricNames.forEach(expectedMetricName -> assertTrue( expectedMetricNames.forEach(expectedName -> {
registry.allMetrics().keySet().stream().anyMatch(metricName -> { MetricName expectMetricName = metricName(expectedType, expectedName);
if (metricName.getGroup().equals(EXPECTED_GROUP) && metricName.getType().equals(expectedType) assertTrue(registry.allMetrics().containsKey(expectMetricName), "Missing metric: " + expectMetricName);
&& metricName.getScope() == null && metricName.getName().equals(expectedMetricName)) { });
// It has to exist AND the MBean name has to be correct;
// fail right here if the MBean name doesn't match
String expectedMBeanPrefix = EXPECTED_GROUP + ":type=" + expectedType + ",name=";
assertEquals(expectedMBeanPrefix + expectedMetricName, metricName.getMBeanName(),
"Incorrect MBean name");
return true; // the metric name exists and the associated MBean name matches
} else {
return false; // this one didn't match
}
}), "Missing metric: " + expectedMetricName));
} }
private static void assertMetricsRemoved(MetricsRegistry registry, Set<String> expectedMetricNames, String expectedType) { private static void assertMetricsRemoved(MetricsRegistry registry, Set<String> expectedMetricNames, String expectedType) {
expectedMetricNames.forEach(expectedMetricName -> assertTrue( expectedMetricNames.forEach(expectedName -> {
registry.allMetrics().keySet().stream().noneMatch(metricName -> MetricName expectMetricName = metricName(expectedType, expectedName);
metricName.getGroup().equals(EXPECTED_GROUP) && metricName.getType().equals(expectedType) assertFalse(registry.allMetrics().containsKey(expectMetricName), "Found metric: " + expectMetricName);
&& metricName.getScope() == null && metricName.getName().equals(expectedMetricName)), });
"Metric not removed when closed: " + expectedMetricName));
} }
} }