Return-Path: X-Original-To: apmail-ambari-commits-archive@www.apache.org Delivered-To: apmail-ambari-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id EA3EE17593 for ; Thu, 19 Feb 2015 22:04:28 +0000 (UTC) Received: (qmail 35314 invoked by uid 500); 19 Feb 2015 22:04:13 -0000 Delivered-To: apmail-ambari-commits-archive@ambari.apache.org Received: (qmail 35289 invoked by uid 500); 19 Feb 2015 22:04:13 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 35280 invoked by uid 99); 19 Feb 2015 22:04:13 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Feb 2015 22:04:13 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E1425E05D1; Thu, 19 Feb 2015 22:04:12 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: yusaku@apache.org To: commits@ambari.apache.org Message-Id: <63ad4c22beb54a90a78eda397b458ece@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ambari git commit: Revert "AMBARI-9511. Remove hadoop-common*.jar dep form sinks. (mpapyrkovskyy)" Breaks trunk build. This reverts commit ab491eaba7fd1cb6f4052469563dfa79958500fb. Date: Thu, 19 Feb 2015 22:04:12 +0000 (UTC) Repository: ambari Updated Branches: refs/heads/trunk 1646be070 -> 585f1ed61 Revert "AMBARI-9511. Remove hadoop-common*.jar dep form sinks. (mpapyrkovskyy)" Breaks trunk build. This reverts commit ab491eaba7fd1cb6f4052469563dfa79958500fb. Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/585f1ed6 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/585f1ed6 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/585f1ed6 Branch: refs/heads/trunk Commit: 585f1ed619e277182e33e8e8b55bfd82f49b6d8d Parents: 1646be0 Author: Yusaku Sako Authored: Thu Feb 19 14:03:52 2015 -0800 Committer: Yusaku Sako Committed: Thu Feb 19 14:03:52 2015 -0800 ---------------------------------------------------------------------- ambari-metrics/ambari-metrics-common/pom.xml | 16 ++------ .../timeline/AbstractTimelineMetricsSink.java | 3 -- .../metrics2/sink/timeline/TimelineMetric.java | 10 ++--- .../metrics2/sink/timeline/TimelineMetrics.java | 9 ++--- .../timeline/cache/TimelineMetricsCache.java | 9 +++-- .../timeline/configuration/Configuration.java | 6 +-- .../cache/TimelineMetricsCacheTest.java | 9 +++-- .../ambari-metrics-flume-sink/pom.xml | 5 --- .../sink/flume/FlumeTimelineMetricsSink.java | 12 +++--- .../flume/FlumeTimelineMetricsSinkTest.java | 12 +++--- .../ambari-metrics-hadoop-sink/pom.xml | 5 --- .../timeline/HadoopTimelineMetricsSink.java | 27 ++++--------- .../timeline/HadoopTimelineMetricsSinkTest.java | 41 ++++++++++++-------- .../ambari-metrics-kafka-sink/pom.xml | 12 +----- .../kafka/KafkaTimelineMetricsReporter.java | 2 +- .../ambari-metrics-storm-sink/pom.xml | 5 --- .../storm/StormTimelineMetricsReporter.java | 3 +- .../sink/storm/StormTimelineMetricsSink.java | 2 +- .../storm/StormTimelineMetricsSinkTest.java | 20 ++++------ 19 files changed, 79 insertions(+), 129 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/585f1ed6/ambari-metrics/ambari-metrics-common/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-metrics/ambari-metrics-common/pom.xml b/ambari-metrics/ambari-metrics-common/pom.xml index 9cad5d4..4658cfe 100644 --- a/ambari-metrics/ambari-metrics-common/pom.xml +++ b/ambari-metrics/ambari-metrics-common/pom.xml @@ -41,24 +41,14 @@ 1.1.1 - commons-httpclient - commons-httpclient - 3.1 - - - org.codehaus.jackson - jackson-xc - 1.9.13 - - org.apache.hadoop - hadoop-annotations - 2.6.0 + hadoop-common + 2.4.0 org.codehaus.jackson jackson-mapper-asl - 1.9.13 + 1.8.0 junit http://git-wip-us.apache.org/repos/asf/ambari/blob/585f1ed6/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/AbstractTimelineMetricsSink.java ---------------------------------------------------------------------- diff --git a/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/AbstractTimelineMetricsSink.java b/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/AbstractTimelineMetricsSink.java index 4f5c6a1..17560ac 100644 --- a/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/AbstractTimelineMetricsSink.java +++ b/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/AbstractTimelineMetricsSink.java @@ -21,9 +21,6 @@ import java.io.IOException; import java.net.ConnectException; import java.net.SocketAddress; -import java.io.IOException; -import java.net.SocketAddress; - import org.apache.commons.httpclient.HttpClient; import org.apache.commons.httpclient.methods.PostMethod; import org.apache.commons.httpclient.methods.StringRequestEntity; http://git-wip-us.apache.org/repos/asf/ambari/blob/585f1ed6/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/TimelineMetric.java ---------------------------------------------------------------------- diff --git a/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/TimelineMetric.java b/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/TimelineMetric.java index f482e54..68b4be8 100644 --- a/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/TimelineMetric.java +++ b/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/TimelineMetric.java @@ -17,16 +17,14 @@ */ package org.apache.hadoop.metrics2.sink.timeline; -import java.util.Map; -import java.util.TreeMap; - +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; - -import org.apache.hadoop.classification.InterfaceAudience; -import org.apache.hadoop.classification.InterfaceStability; +import java.util.Map; +import java.util.TreeMap; @XmlRootElement(name = "metric") @XmlAccessorType(XmlAccessType.NONE) http://git-wip-us.apache.org/repos/asf/ambari/blob/585f1ed6/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/TimelineMetrics.java ---------------------------------------------------------------------- diff --git a/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/TimelineMetrics.java b/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/TimelineMetrics.java index 3eb0e89..4355fb1 100644 --- a/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/TimelineMetrics.java +++ b/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/TimelineMetrics.java @@ -17,16 +17,15 @@ */ package org.apache.hadoop.metrics2.sink.timeline; -import java.util.ArrayList; -import java.util.List; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; - -import org.apache.hadoop.classification.InterfaceAudience; -import org.apache.hadoop.classification.InterfaceStability; +import java.util.ArrayList; +import java.util.List; /** * The class that hosts a list of timeline entities. http://git-wip-us.apache.org/repos/asf/ambari/blob/585f1ed6/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/cache/TimelineMetricsCache.java ---------------------------------------------------------------------- diff --git a/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/cache/TimelineMetricsCache.java b/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/cache/TimelineMetricsCache.java index 224b490..0f2c9a3 100644 --- a/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/cache/TimelineMetricsCache.java +++ b/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/cache/TimelineMetricsCache.java @@ -17,10 +17,12 @@ */ package org.apache.hadoop.metrics2.sink.timeline.cache; +import com.google.common.base.Optional; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceStability; +import org.apache.hadoop.metrics2.MetricType; import org.apache.hadoop.metrics2.sink.timeline.TimelineMetric; import java.util.HashMap; @@ -158,8 +160,7 @@ public class TimelineMetricsCache { String metricName = timelineMetric.getMetricName(); double firstValue = timelineMetric.getMetricValues().size() > 0 ? timelineMetric.getMetricValues().entrySet().iterator().next().getValue() : 0; - Double value = counterMetricLastValue.get(metricName); - double previousValue = value != null ? value : firstValue; + double previousValue = Optional.fromNullable(counterMetricLastValue.get(metricName)).or(firstValue); Map metricValues = timelineMetric.getMetricValues(); Map newMetricValues = new TreeMap(); for (Map.Entry entry : metricValues.entrySet()) { @@ -170,8 +171,8 @@ public class TimelineMetricsCache { counterMetricLastValue.put(metricName, previousValue); } - public void putTimelineMetric(TimelineMetric timelineMetric, boolean isCounter) { - if (isCounter) { + public void putTimelineMetric(TimelineMetric timelineMetric, MetricType type) { + if (type == MetricType.COUNTER) { transformMetricValuesToDerivative(timelineMetric); } putTimelineMetric(timelineMetric); http://git-wip-us.apache.org/repos/asf/ambari/blob/585f1ed6/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/configuration/Configuration.java ---------------------------------------------------------------------- diff --git a/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/configuration/Configuration.java b/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/configuration/Configuration.java index a0380e1..940ea75 100644 --- a/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/configuration/Configuration.java +++ b/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/configuration/Configuration.java @@ -18,14 +18,14 @@ package org.apache.hadoop.metrics2.sink.timeline.configuration; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; import java.util.Properties; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - public class Configuration { public final Log LOG = LogFactory.getLog(this.getClass()); private final Properties properties; http://git-wip-us.apache.org/repos/asf/ambari/blob/585f1ed6/ambari-metrics/ambari-metrics-common/src/test/java/org/apache/hadoop/metrics2/sink/timeline/cache/TimelineMetricsCacheTest.java ---------------------------------------------------------------------- diff --git a/ambari-metrics/ambari-metrics-common/src/test/java/org/apache/hadoop/metrics2/sink/timeline/cache/TimelineMetricsCacheTest.java b/ambari-metrics/ambari-metrics-common/src/test/java/org/apache/hadoop/metrics2/sink/timeline/cache/TimelineMetricsCacheTest.java index 4a13d63..8f07a27 100644 --- a/ambari-metrics/ambari-metrics-common/src/test/java/org/apache/hadoop/metrics2/sink/timeline/cache/TimelineMetricsCacheTest.java +++ b/ambari-metrics/ambari-metrics-common/src/test/java/org/apache/hadoop/metrics2/sink/timeline/cache/TimelineMetricsCacheTest.java @@ -17,6 +17,7 @@ */ package org.apache.hadoop.metrics2.sink.timeline.cache; +import org.apache.hadoop.metrics2.MetricType; import org.apache.hadoop.metrics2.sink.timeline.TimelineMetric; import org.junit.Test; @@ -40,13 +41,13 @@ public class TimelineMetricsCacheTest { TimelineMetric metric = createTimelineMetric(new TreeMap() {{ put(1L, 10.0); }}, DEFAULT_START_TIME); - timelineMetricsCache.putTimelineMetric(metric, true); + timelineMetricsCache.putTimelineMetric(metric, MetricType.COUNTER); metric = createTimelineMetric(new TreeMap() {{ put(2L, 10.0); put(3L, 20.0); put(4L, 30.0); }}, DEFAULT_START_TIME + 2 * TimelineMetricsCache.MAX_EVICTION_TIME_MILLIS); - timelineMetricsCache.putTimelineMetric(metric, true); + timelineMetricsCache.putTimelineMetric(metric, MetricType.COUNTER); TimelineMetric cachedMetric = timelineMetricsCache.getTimelineMetric(METRIC_NAME); assertEquals(0, cachedMetric.getMetricValues().get(1L), delta); @@ -59,12 +60,12 @@ public class TimelineMetricsCacheTest { put(6L, 120.0); put(7L, 230.0); }}, DEFAULT_START_TIME + 3 * TimelineMetricsCache.MAX_EVICTION_TIME_MILLIS); - timelineMetricsCache.putTimelineMetric(metric, true); + timelineMetricsCache.putTimelineMetric(metric, MetricType.COUNTER); metric = createTimelineMetric(new TreeMap() {{ put(8L, 300.0); }}, DEFAULT_START_TIME + 5 * TimelineMetricsCache.MAX_EVICTION_TIME_MILLIS); - timelineMetricsCache.putTimelineMetric(metric, true); + timelineMetricsCache.putTimelineMetric(metric, MetricType.COUNTER); cachedMetric = timelineMetricsCache.getTimelineMetric(METRIC_NAME); assertEquals(70, cachedMetric.getMetricValues().get(5L), delta); assertEquals(20, cachedMetric.getMetricValues().get(6L), delta); http://git-wip-us.apache.org/repos/asf/ambari/blob/585f1ed6/ambari-metrics/ambari-metrics-flume-sink/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-metrics/ambari-metrics-flume-sink/pom.xml b/ambari-metrics/ambari-metrics-flume-sink/pom.xml index a83d7b0..f11b8b2 100644 --- a/ambari-metrics/ambari-metrics-flume-sink/pom.xml +++ b/ambari-metrics/ambari-metrics-flume-sink/pom.xml @@ -108,11 +108,6 @@ limitations under the License. ${project.version} - org.codehaus.jackson - jackson-mapper-asl - 1.9.13 - - junit junit test http://git-wip-us.apache.org/repos/asf/ambari/blob/585f1ed6/ambari-metrics/ambari-metrics-flume-sink/src/main/java/org/apache/hadoop/metrics2/sink/flume/FlumeTimelineMetricsSink.java ---------------------------------------------------------------------- diff --git a/ambari-metrics/ambari-metrics-flume-sink/src/main/java/org/apache/hadoop/metrics2/sink/flume/FlumeTimelineMetricsSink.java b/ambari-metrics/ambari-metrics-flume-sink/src/main/java/org/apache/hadoop/metrics2/sink/flume/FlumeTimelineMetricsSink.java index 9e66c99..0231b24 100644 --- a/ambari-metrics/ambari-metrics-flume-sink/src/main/java/org/apache/hadoop/metrics2/sink/flume/FlumeTimelineMetricsSink.java +++ b/ambari-metrics/ambari-metrics-flume-sink/src/main/java/org/apache/hadoop/metrics2/sink/flume/FlumeTimelineMetricsSink.java @@ -24,13 +24,14 @@ import org.apache.flume.Context; import org.apache.flume.FlumeException; import org.apache.flume.instrumentation.MonitorService; import org.apache.flume.instrumentation.util.JMXPollUtil; +import org.apache.hadoop.metrics2.MetricType; import org.apache.hadoop.metrics2.sink.timeline.TimelineMetric; import org.apache.hadoop.metrics2.sink.timeline.TimelineMetrics; import org.apache.hadoop.metrics2.sink.timeline.AbstractTimelineMetricsSink; import org.apache.hadoop.metrics2.sink.timeline.UnableToConnectException; import org.apache.hadoop.metrics2.sink.timeline.cache.TimelineMetricsCache; import org.apache.hadoop.metrics2.sink.timeline.configuration.Configuration; -import org.apache.hadoop.metrics2.sink.util.Servers; +import org.apache.hadoop.metrics2.util.Servers; import java.io.IOException; import java.net.InetAddress; @@ -47,8 +48,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; - - public class FlumeTimelineMetricsSink extends AbstractTimelineMetricsSink implements MonitorService { private SocketAddress socketAddress; private String collectorUri; @@ -159,7 +158,7 @@ public class FlumeTimelineMetricsSink extends AbstractTimelineMetricsSink implem TimelineMetric timelineMetric = createTimelineMetric(currentTimeMillis, component, attributeName, attributeValue); // Put intermediate values into the cache until it is time to send - metricsCache.putTimelineMetric(timelineMetric, isCounterMetric(attributeName)); + metricsCache.putTimelineMetric(timelineMetric, getMetricType(attributeName)); TimelineMetric cachedMetric = metricsCache.getTimelineMetric(attributeName); @@ -190,7 +189,8 @@ public class FlumeTimelineMetricsSink extends AbstractTimelineMetricsSink implem } } - private boolean isCounterMetric(String attributeName) { - return counterMetrics.contains(attributeName); + private MetricType getMetricType(String attributeName) { + return counterMetrics.contains(attributeName) ? + MetricType.COUNTER : MetricType.GAUGE; } } http://git-wip-us.apache.org/repos/asf/ambari/blob/585f1ed6/ambari-metrics/ambari-metrics-flume-sink/src/test/java/org/apache/hadoop/metrics2/sink/flume/FlumeTimelineMetricsSinkTest.java ---------------------------------------------------------------------- diff --git a/ambari-metrics/ambari-metrics-flume-sink/src/test/java/org/apache/hadoop/metrics2/sink/flume/FlumeTimelineMetricsSinkTest.java b/ambari-metrics/ambari-metrics-flume-sink/src/test/java/org/apache/hadoop/metrics2/sink/flume/FlumeTimelineMetricsSinkTest.java index 647e026..90831bf 100644 --- a/ambari-metrics/ambari-metrics-flume-sink/src/test/java/org/apache/hadoop/metrics2/sink/flume/FlumeTimelineMetricsSinkTest.java +++ b/ambari-metrics/ambari-metrics-flume-sink/src/test/java/org/apache/hadoop/metrics2/sink/flume/FlumeTimelineMetricsSinkTest.java @@ -18,12 +18,6 @@ package org.apache.hadoop.metrics2.sink.flume; -import static org.powermock.api.easymock.PowerMock.mockStatic; -import static org.powermock.api.easymock.PowerMock.replay; -import static org.powermock.api.easymock.PowerMock.verifyAll; - -import java.util.Collections; - import org.apache.commons.httpclient.HttpClient; import org.apache.flume.instrumentation.util.JMXPollUtil; import org.apache.hadoop.metrics2.sink.timeline.TimelineMetric; @@ -33,6 +27,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; +import java.util.Collections; +import static org.powermock.api.easymock.PowerMock.mockStatic; +import static org.powermock.api.easymock.PowerMock.replay; +import static org.powermock.api.easymock.PowerMock.verifyAll; @RunWith(PowerMockRunner.class) @PrepareForTest(JMXPollUtil.class) @@ -104,4 +102,4 @@ public class FlumeTimelineMetricsSinkTest { collector.run(); verifyAll(); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/585f1ed6/ambari-metrics/ambari-metrics-hadoop-sink/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-metrics/ambari-metrics-hadoop-sink/pom.xml b/ambari-metrics/ambari-metrics-hadoop-sink/pom.xml index ee3bcd8..848a8f2 100644 --- a/ambari-metrics/ambari-metrics-hadoop-sink/pom.xml +++ b/ambari-metrics/ambari-metrics-hadoop-sink/pom.xml @@ -158,11 +158,6 @@ limitations under the License. compile - org.codehaus.jackson - jackson-mapper-asl - 1.9.13 - - junit junit test http://git-wip-us.apache.org/repos/asf/ambari/blob/585f1ed6/ambari-metrics/ambari-metrics-hadoop-sink/src/main/java/org/apache/hadoop/metrics2/sink/timeline/HadoopTimelineMetricsSink.java ---------------------------------------------------------------------- diff --git a/ambari-metrics/ambari-metrics-hadoop-sink/src/main/java/org/apache/hadoop/metrics2/sink/timeline/HadoopTimelineMetricsSink.java b/ambari-metrics/ambari-metrics-hadoop-sink/src/main/java/org/apache/hadoop/metrics2/sink/timeline/HadoopTimelineMetricsSink.java index 06f6011..25058b3 100644 --- a/ambari-metrics/ambari-metrics-hadoop-sink/src/main/java/org/apache/hadoop/metrics2/sink/timeline/HadoopTimelineMetricsSink.java +++ b/ambari-metrics/ambari-metrics-hadoop-sink/src/main/java/org/apache/hadoop/metrics2/sink/timeline/HadoopTimelineMetricsSink.java @@ -17,33 +17,21 @@ */ package org.apache.hadoop.metrics2.sink.timeline; -import java.io.IOException; -import java.net.SocketAddress; -import java.net.UnknownHostException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; - import org.apache.commons.configuration.SubsetConfiguration; import org.apache.commons.lang.ClassUtils; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceStability; -import org.apache.hadoop.metrics2.AbstractMetric; -import org.apache.hadoop.metrics2.MetricsException; -import org.apache.hadoop.metrics2.MetricsRecord; -import org.apache.hadoop.metrics2.MetricsSink; -import org.apache.hadoop.metrics2.MetricsTag; -import org.apache.hadoop.metrics2.MetricType; +import org.apache.hadoop.metrics2.*; import org.apache.hadoop.metrics2.impl.MsInfo; import org.apache.hadoop.metrics2.sink.timeline.cache.TimelineMetricsCache; import org.apache.hadoop.metrics2.util.Servers; import org.apache.hadoop.net.DNS; +import java.io.IOException; +import java.net.SocketAddress; +import java.net.UnknownHostException; +import java.util.*; + @InterfaceAudience.Public @InterfaceStability.Evolving public class HadoopTimelineMetricsSink extends AbstractTimelineMetricsSink implements MetricsSink { @@ -176,8 +164,7 @@ public class HadoopTimelineMetricsSink extends AbstractTimelineMetricsSink imple timelineMetric.setType(ClassUtils.getShortCanonicalName(value, "Number")); timelineMetric.getMetricValues().put(startTime, value.doubleValue()); // Put intermediate values into the cache until it is time to send - boolean isCounter = MetricType.COUNTER == metric.type(); - metricsCache.putTimelineMetric(timelineMetric, isCounter); + metricsCache.putTimelineMetric(timelineMetric, metric.type()); // Retrieve all values from cache if it is time to send TimelineMetric cachedMetric = metricsCache.getTimelineMetric(name); http://git-wip-us.apache.org/repos/asf/ambari/blob/585f1ed6/ambari-metrics/ambari-metrics-hadoop-sink/src/test/java/org/apache/hadoop/metrics2/sink/timeline/HadoopTimelineMetricsSinkTest.java ---------------------------------------------------------------------- diff --git a/ambari-metrics/ambari-metrics-hadoop-sink/src/test/java/org/apache/hadoop/metrics2/sink/timeline/HadoopTimelineMetricsSinkTest.java b/ambari-metrics/ambari-metrics-hadoop-sink/src/test/java/org/apache/hadoop/metrics2/sink/timeline/HadoopTimelineMetricsSinkTest.java index dddbbd0..d7b5d73 100644 --- a/ambari-metrics/ambari-metrics-hadoop-sink/src/test/java/org/apache/hadoop/metrics2/sink/timeline/HadoopTimelineMetricsSinkTest.java +++ b/ambari-metrics/ambari-metrics-hadoop-sink/src/test/java/org/apache/hadoop/metrics2/sink/timeline/HadoopTimelineMetricsSinkTest.java @@ -18,34 +18,43 @@ package org.apache.hadoop.metrics2.sink.timeline; +import org.apache.commons.configuration.SubsetConfiguration; +import org.apache.commons.httpclient.HttpClient; +import org.apache.commons.httpclient.methods.PostMethod; +import org.apache.hadoop.metrics2.AbstractMetric; +import org.apache.hadoop.metrics2.MetricsRecord; +import org.apache.hadoop.metrics2.sink.timeline.cache.TimelineMetricsCache; +import org.easymock.Capture; +import org.easymock.EasyMock; +import org.easymock.IAnswer; +import org.easymock.IArgumentMatcher; +import org.junit.Assert; +import org.junit.Test; + +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Set; + import static org.apache.hadoop.metrics2.sink.timeline.AbstractTimelineMetricsSink.COLLECTOR_HOST_PROPERTY; import static org.apache.hadoop.metrics2.sink.timeline.AbstractTimelineMetricsSink.MAX_METRIC_ROW_CACHE_SIZE; import static org.apache.hadoop.metrics2.sink.timeline.AbstractTimelineMetricsSink.METRICS_SEND_INTERVAL; import static org.easymock.EasyMock.anyInt; import static org.easymock.EasyMock.anyObject; +import static org.easymock.EasyMock.capture; import static org.easymock.EasyMock.createMockBuilder; import static org.easymock.EasyMock.createNiceMock; import static org.easymock.EasyMock.eq; import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.expectLastCall; import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.reportMatcher; import static org.easymock.EasyMock.verify; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Iterator; -import java.util.List; - -import org.apache.commons.configuration.SubsetConfiguration; -import org.apache.commons.httpclient.HttpClient; -import org.apache.commons.httpclient.methods.PostMethod; -import org.apache.hadoop.metrics2.AbstractMetric; -import org.apache.hadoop.metrics2.MetricsRecord; -import org.easymock.EasyMock; -import org.easymock.IAnswer; -import org.junit.Assert; -import org.junit.Test; - public class HadoopTimelineMetricsSinkTest { @Test @@ -240,4 +249,4 @@ public class HadoopTimelineMetricsSinkTest { Assert.assertEquals(new Double(5.0), values.next()); Assert.assertEquals(new Double(6.0), values.next()); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/585f1ed6/ambari-metrics/ambari-metrics-kafka-sink/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-metrics/ambari-metrics-kafka-sink/pom.xml b/ambari-metrics/ambari-metrics-kafka-sink/pom.xml index 2aefe1d..e385935 100644 --- a/ambari-metrics/ambari-metrics-kafka-sink/pom.xml +++ b/ambari-metrics/ambari-metrics-kafka-sink/pom.xml @@ -42,7 +42,7 @@ limitations under the License. copy-dependencies - commons-codec,commons-collections,commons-httpclient,commons-lang,commons-logging,guava,jackson-core-asl,jackson-mapper-asl,jackson-xc + commons-codec,commons-collections,commons-httpclient,commons-lang,commons-logging,guava,jackson-core-asl,jackson-mapper-asl,jackson-xc,hadoop-common ${project.build.directory}/lib @@ -130,16 +130,6 @@ limitations under the License. 2.2.0 - commons-lang - commons-lang - 2.6 - - - org.codehaus.jackson - jackson-mapper-asl - 1.9.13 - - junit junit test http://git-wip-us.apache.org/repos/asf/ambari/blob/585f1ed6/ambari-metrics/ambari-metrics-kafka-sink/src/main/java/org/apache/hadoop/metrics2/sink/kafka/KafkaTimelineMetricsReporter.java ---------------------------------------------------------------------- diff --git a/ambari-metrics/ambari-metrics-kafka-sink/src/main/java/org/apache/hadoop/metrics2/sink/kafka/KafkaTimelineMetricsReporter.java b/ambari-metrics/ambari-metrics-kafka-sink/src/main/java/org/apache/hadoop/metrics2/sink/kafka/KafkaTimelineMetricsReporter.java index 1f44494..63097e5 100644 --- a/ambari-metrics/ambari-metrics-kafka-sink/src/main/java/org/apache/hadoop/metrics2/sink/kafka/KafkaTimelineMetricsReporter.java +++ b/ambari-metrics/ambari-metrics-kafka-sink/src/main/java/org/apache/hadoop/metrics2/sink/kafka/KafkaTimelineMetricsReporter.java @@ -40,7 +40,7 @@ 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 org.apache.hadoop.metrics2.sink.util.Servers; +import org.apache.hadoop.metrics2.util.Servers; import com.yammer.metrics.Metrics; import com.yammer.metrics.core.Counter; http://git-wip-us.apache.org/repos/asf/ambari/blob/585f1ed6/ambari-metrics/ambari-metrics-storm-sink/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-metrics/ambari-metrics-storm-sink/pom.xml b/ambari-metrics/ambari-metrics-storm-sink/pom.xml index 70bdec5..d069622 100644 --- a/ambari-metrics/ambari-metrics-storm-sink/pom.xml +++ b/ambari-metrics/ambari-metrics-storm-sink/pom.xml @@ -113,11 +113,6 @@ limitations under the License. ${project.version} - org.codehaus.jackson - jackson-mapper-asl - 1.9.13 - - junit junit test http://git-wip-us.apache.org/repos/asf/ambari/blob/585f1ed6/ambari-metrics/ambari-metrics-storm-sink/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsReporter.java ---------------------------------------------------------------------- diff --git a/ambari-metrics/ambari-metrics-storm-sink/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsReporter.java b/ambari-metrics/ambari-metrics-storm-sink/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsReporter.java index 1f7df51..8c79b55 100644 --- a/ambari-metrics/ambari-metrics-storm-sink/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsReporter.java +++ b/ambari-metrics/ambari-metrics-storm-sink/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsReporter.java @@ -29,7 +29,8 @@ import org.apache.commons.lang.Validate; 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.util.Servers; +import org.apache.hadoop.metrics2.util.Servers; +import org.codehaus.jackson.map.AnnotationIntrospector; import java.net.InetAddress; import java.net.InetSocketAddress; http://git-wip-us.apache.org/repos/asf/ambari/blob/585f1ed6/ambari-metrics/ambari-metrics-storm-sink/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsSink.java ---------------------------------------------------------------------- diff --git a/ambari-metrics/ambari-metrics-storm-sink/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsSink.java b/ambari-metrics/ambari-metrics-storm-sink/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsSink.java index dd0e72f..ffcc6ed 100644 --- a/ambari-metrics/ambari-metrics-storm-sink/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsSink.java +++ b/ambari-metrics/ambari-metrics-storm-sink/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsSink.java @@ -30,7 +30,7 @@ import org.apache.hadoop.metrics2.sink.timeline.AbstractTimelineMetricsSink; import org.apache.hadoop.metrics2.sink.timeline.UnableToConnectException; import org.apache.hadoop.metrics2.sink.timeline.cache.TimelineMetricsCache; import org.apache.hadoop.metrics2.sink.timeline.configuration.Configuration; -import org.apache.hadoop.metrics2.sink.util.Servers; +import org.apache.hadoop.metrics2.util.Servers; import java.io.IOException; import java.net.InetAddress; http://git-wip-us.apache.org/repos/asf/ambari/blob/585f1ed6/ambari-metrics/ambari-metrics-storm-sink/src/test/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsSinkTest.java ---------------------------------------------------------------------- diff --git a/ambari-metrics/ambari-metrics-storm-sink/src/test/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsSinkTest.java b/ambari-metrics/ambari-metrics-storm-sink/src/test/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsSinkTest.java index 15021e5..95a9329 100644 --- a/ambari-metrics/ambari-metrics-storm-sink/src/test/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsSinkTest.java +++ b/ambari-metrics/ambari-metrics-storm-sink/src/test/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsSinkTest.java @@ -18,24 +18,18 @@ package org.apache.hadoop.metrics2.sink.storm; -import static org.easymock.EasyMock.anyObject; -import static org.easymock.EasyMock.createNiceMock; -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.expectLastCall; -import static org.easymock.EasyMock.replay; -import static org.easymock.EasyMock.verify; - -import java.io.IOException; -import java.net.SocketAddress; -import java.util.Collections; - +import backtype.storm.metric.api.IMetricsConsumer; import org.apache.commons.httpclient.HttpClient; import org.apache.commons.httpclient.methods.PostMethod; import org.apache.hadoop.metrics2.sink.timeline.TimelineMetric; import org.apache.hadoop.metrics2.sink.timeline.cache.TimelineMetricsCache; import org.junit.Test; -import backtype.storm.metric.api.IMetricsConsumer; +import java.io.IOException; +import java.net.SocketAddress; +import java.util.Collections; + +import static org.easymock.EasyMock.*; public class StormTimelineMetricsSinkTest { @Test @@ -71,4 +65,4 @@ public class StormTimelineMetricsSinkTest { Collections.singleton(new IMetricsConsumer.DataPoint("key1", 42))); verify(timelineMetricsCache, httpClient); } -} +} \ No newline at end of file