You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by wu...@apache.org on 2022/12/27 07:37:07 UTC

[ambari-metrics] branch master updated: AMBARI-25828: Switch class Metrics to KafkaYammerMetrics (#91)

This is an automated email from the ASF dual-hosted git repository.

wuzhiguo 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 5c38326  AMBARI-25828: Switch class Metrics to KafkaYammerMetrics (#91)
5c38326 is described below

commit 5c383260287ab09d0e38528ce46fccb66fc4fd2e
Author: Yu Hou <52...@qq.com>
AuthorDate: Tue Dec 27 15:37:02 2022 +0800

    AMBARI-25828: Switch class Metrics to KafkaYammerMetrics (#91)
---
 .gitignore                                                          | 1 +
 .../hadoop/metrics2/sink/kafka/KafkaTimelineMetricsReporter.java    | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 845f705..bd18535 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@ ambari-metrics-host-monitoring/src/main/python/psutil/build/
 rebel.xml
 rebel-remote.xml
 out
+.vscode
diff --git a/ambari-metrics-kafka-sink/src/main/java/org/apache/hadoop/metrics2/sink/kafka/KafkaTimelineMetricsReporter.java b/ambari-metrics-kafka-sink/src/main/java/org/apache/hadoop/metrics2/sink/kafka/KafkaTimelineMetricsReporter.java
index 14ce666..c296ef3 100644
--- a/ambari-metrics-kafka-sink/src/main/java/org/apache/hadoop/metrics2/sink/kafka/KafkaTimelineMetricsReporter.java
+++ b/ambari-metrics-kafka-sink/src/main/java/org/apache/hadoop/metrics2/sink/kafka/KafkaTimelineMetricsReporter.java
@@ -32,7 +32,6 @@ import org.apache.hadoop.metrics2.sink.timeline.AbstractTimelineMetricsSink;
 import org.apache.hadoop.metrics2.sink.timeline.TimelineMetric;
 import org.apache.hadoop.metrics2.sink.timeline.TimelineMetrics;
 import org.apache.hadoop.metrics2.sink.timeline.cache.TimelineMetricsCache;
-import com.yammer.metrics.Metrics;
 import com.yammer.metrics.core.Counter;
 import com.yammer.metrics.core.Gauge;
 import com.yammer.metrics.core.Histogram;
@@ -44,6 +43,7 @@ import com.yammer.metrics.core.MetricsRegistry;
 import com.yammer.metrics.core.Summarizable;
 import com.yammer.metrics.core.Timer;
 import com.yammer.metrics.stats.Snapshot;
+import kafka.metrics.KafkaYammerMetrics;
 import kafka.metrics.KafkaMetricsConfig;
 import kafka.metrics.KafkaMetricsReporter;
 import kafka.utils.VerifiableProperties;
@@ -94,7 +94,7 @@ public class KafkaTimelineMetricsReporter extends AbstractTimelineMetricsSink
 
   private String[] excludedMetricsPrefixes;
   private String[] includedMetricsPrefixes;
-  private String[] includedMetricsRegex;
+  private String[] includedMetricsRegex = new String[0];
   // Local cache to avoid prefix matching everytime
   private Set<String> excludedMetrics = new HashSet<>();
   private boolean hostInMemoryAggregationEnabled;
@@ -262,7 +262,7 @@ public class KafkaTimelineMetricsReporter extends AbstractTimelineMetricsSink
   }
 
   private void initializeReporter() {
-    reporter = new TimelineScheduledReporter(Metrics.defaultRegistry(), "timeline-scheduled-reporter",
+    reporter = new TimelineScheduledReporter(KafkaYammerMetrics.defaultRegistry(), "timeline-scheduled-reporter",
         TimeUnit.SECONDS, TimeUnit.MILLISECONDS);
     initialized = true;
   }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ambari.apache.org
For additional commands, e-mail: commits-help@ambari.apache.org