You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by se...@apache.org on 2023/02/24 07:29:22 UTC
[ambari-metrics] branch master updated: AMBARI-25866: Fix an unit test failure on ambari-metrics-kafka-sink (#104)
This is an automated email from the ASF dual-hosted git repository.
sekikn pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ambari-metrics.git
The following commit(s) were added to refs/heads/master by this push:
new a39547f AMBARI-25866: Fix an unit test failure on ambari-metrics-kafka-sink (#104)
a39547f is described below
commit a39547f250c8456c74f42baf779a63a1e0d146b6
Author: Zhiguo Wu <wu...@apache.org>
AuthorDate: Fri Feb 24 15:29:17 2023 +0800
AMBARI-25866: Fix an unit test failure on ambari-metrics-kafka-sink (#104)
---
.../kafka/KafkaTimelineMetricsReporterTest.java | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/ambari-metrics-kafka-sink/src/test/java/org/apache/hadoop/metrics2/sink/kafka/KafkaTimelineMetricsReporterTest.java b/ambari-metrics-kafka-sink/src/test/java/org/apache/hadoop/metrics2/sink/kafka/KafkaTimelineMetricsReporterTest.java
index cc56227..7187f47 100644
--- a/ambari-metrics-kafka-sink/src/test/java/org/apache/hadoop/metrics2/sink/kafka/KafkaTimelineMetricsReporterTest.java
+++ b/ambari-metrics-kafka-sink/src/test/java/org/apache/hadoop/metrics2/sink/kafka/KafkaTimelineMetricsReporterTest.java
@@ -27,6 +27,7 @@ import com.yammer.metrics.core.Metric;
import com.yammer.metrics.core.MetricsRegistry;
import com.yammer.metrics.core.Timer;
import junit.framework.Assert;
+import kafka.metrics.KafkaYammerMetrics;
import kafka.utils.VerifiableProperties;
import org.apache.hadoop.metrics2.sink.timeline.TimelineMetric;
import org.apache.hadoop.metrics2.sink.timeline.cache.TimelineMetricsCache;
@@ -51,7 +52,7 @@ import static org.powermock.api.easymock.PowerMock.verifyAll;
@RunWith(PowerMockRunner.class)
@PrepareForTest({ Metrics.class, URL.class, OutputStream.class,
- KafkaTimelineMetricsReporter.TimelineScheduledReporter.class })
+ KafkaTimelineMetricsReporter.TimelineScheduledReporter.class, KafkaYammerMetrics.class })
@PowerMockIgnore({"javax.management.*", "org.apache.log4j.*", "org.slf4j.*"})
public class KafkaTimelineMetricsReporterTest {
@@ -92,11 +93,11 @@ public class KafkaTimelineMetricsReporterTest {
@Test
public void testReporterStartStop() {
- mockStatic(Metrics.class);
- EasyMock.expect(Metrics.defaultRegistry()).andReturn(registry).times(2);
+ mockStatic(KafkaYammerMetrics.class);
+ EasyMock.expect(KafkaYammerMetrics.defaultRegistry()).andReturn(registry).times(2);
TimelineMetricsCache timelineMetricsCache = getTimelineMetricsCache(kafkaTimelineMetricsReporter);
kafkaTimelineMetricsReporter.setMetricsCache(timelineMetricsCache);
- replay(Metrics.class, timelineMetricsCache);
+ replay(KafkaYammerMetrics.class, timelineMetricsCache);
kafkaTimelineMetricsReporter.init(props);
kafkaTimelineMetricsReporter.stopReporter();
verifyAll();
@@ -104,11 +105,11 @@ public class KafkaTimelineMetricsReporterTest {
@Test
public void testReporterStartStopHttps() {
- mockStatic(Metrics.class);
- EasyMock.expect(Metrics.defaultRegistry()).andReturn(registry).times(2);
+ mockStatic(KafkaYammerMetrics.class);
+ EasyMock.expect(KafkaYammerMetrics.defaultRegistry()).andReturn(registry).times(2);
TimelineMetricsCache timelineMetricsCache = getTimelineMetricsCache(kafkaTimelineMetricsReporter);
kafkaTimelineMetricsReporter.setMetricsCache(timelineMetricsCache);
- replay(Metrics.class, timelineMetricsCache);
+ replay(KafkaYammerMetrics.class, timelineMetricsCache);
Properties properties = new Properties();
properties.setProperty("zookeeper.connect", "localhost:2181");
@@ -133,12 +134,12 @@ public class KafkaTimelineMetricsReporterTest {
@Test
public void testMetricsExclusionPolicy() throws Exception {
- mockStatic(Metrics.class);
- EasyMock.expect(Metrics.defaultRegistry()).andReturn(registry).times(2);
+ mockStatic(KafkaYammerMetrics.class);
+ EasyMock.expect(KafkaYammerMetrics.defaultRegistry()).andReturn(registry).times(2);
TimelineMetricsCache timelineMetricsCache = getTimelineMetricsCache(kafkaTimelineMetricsReporter);
kafkaTimelineMetricsReporter.setMetricsCache(timelineMetricsCache);
- replay(Metrics.class, timelineMetricsCache);
+ replay(KafkaYammerMetrics.class, timelineMetricsCache);
kafkaTimelineMetricsReporter.init(props);
Assert.assertTrue(kafkaTimelineMetricsReporter.isExcludedMetric("a.b.c"));
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ambari.apache.org
For additional commands, e-mail: commits-help@ambari.apache.org