You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by jp...@apache.org on 2016/07/19 16:05:55 UTC
nifi git commit: NIFI-2309 Correcting AmbariReportingTask so it
reports total task duration as seconds and as nano-seconds
Repository: nifi
Updated Branches:
refs/heads/master deb2819bf -> 8e2663c54
NIFI-2309 Correcting AmbariReportingTask so it reports total task duration as seconds and as nano-seconds
This closes #672
Signed-off-by: jpercivall <jo...@yahoo.com>
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/8e2663c5
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/8e2663c5
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/8e2663c5
Branch: refs/heads/master
Commit: 8e2663c54da800aadb2de1d3a72bf10ffd6cc247
Parents: deb2819
Author: Bryan Bende <bb...@apache.org>
Authored: Mon Jul 18 17:32:44 2016 -0400
Committer: jpercivall <jo...@yahoo.com>
Committed: Tue Jul 19 11:35:09 2016 -0400
----------------------------------------------------------------------
.../apache/nifi/reporting/ambari/metrics/MetricNames.java | 3 ++-
.../apache/nifi/reporting/ambari/metrics/MetricsService.java | 8 +++++++-
.../nifi/reporting/ambari/metrics/TestMetricsService.java | 3 ++-
3 files changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/8e2663c5/nifi-nar-bundles/nifi-ambari-bundle/nifi-ambari-reporting-task/src/main/java/org/apache/nifi/reporting/ambari/metrics/MetricNames.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-ambari-bundle/nifi-ambari-reporting-task/src/main/java/org/apache/nifi/reporting/ambari/metrics/MetricNames.java b/nifi-nar-bundles/nifi-ambari-bundle/nifi-ambari-reporting-task/src/main/java/org/apache/nifi/reporting/ambari/metrics/MetricNames.java
index f4e89ce..4b62668 100644
--- a/nifi-nar-bundles/nifi-ambari-bundle/nifi-ambari-reporting-task/src/main/java/org/apache/nifi/reporting/ambari/metrics/MetricNames.java
+++ b/nifi-nar-bundles/nifi-ambari-bundle/nifi-ambari-reporting-task/src/main/java/org/apache/nifi/reporting/ambari/metrics/MetricNames.java
@@ -31,7 +31,8 @@ public interface MetricNames {
String BYTES_READ = "BytesReadLast5Minutes";
String BYTES_WRITTEN = "BytesWrittenLast5Minutes";
String ACTIVE_THREADS = "ActiveThreads";
- String TOTAL_TASK_DURATION = "TotalTaskDurationSeconds";
+ String TOTAL_TASK_DURATION_SECONDS = "TotalTaskDurationSeconds";
+ String TOTAL_TASK_DURATION_NANOS = "TotalTaskDurationNanoSeconds";
// JVM Metrics
String JVM_UPTIME = "jvm.uptime";
http://git-wip-us.apache.org/repos/asf/nifi/blob/8e2663c5/nifi-nar-bundles/nifi-ambari-bundle/nifi-ambari-reporting-task/src/main/java/org/apache/nifi/reporting/ambari/metrics/MetricsService.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-ambari-bundle/nifi-ambari-reporting-task/src/main/java/org/apache/nifi/reporting/ambari/metrics/MetricsService.java b/nifi-nar-bundles/nifi-ambari-bundle/nifi-ambari-reporting-task/src/main/java/org/apache/nifi/reporting/ambari/metrics/MetricsService.java
index 8b11051..0671dab 100644
--- a/nifi-nar-bundles/nifi-ambari-bundle/nifi-ambari-reporting-task/src/main/java/org/apache/nifi/reporting/ambari/metrics/MetricsService.java
+++ b/nifi-nar-bundles/nifi-ambari-bundle/nifi-ambari-reporting-task/src/main/java/org/apache/nifi/reporting/ambari/metrics/MetricsService.java
@@ -46,7 +46,13 @@ public class MetricsService {
metrics.put(MetricNames.BYTES_READ, String.valueOf(status.getBytesRead()));
metrics.put(MetricNames.BYTES_WRITTEN, String.valueOf(status.getBytesWritten()));
metrics.put(MetricNames.ACTIVE_THREADS, String.valueOf(status.getActiveThreadCount()));
- metrics.put(MetricNames.TOTAL_TASK_DURATION, String.valueOf(calculateProcessingNanos(status)));
+
+ final long durationNanos = calculateProcessingNanos(status);
+ metrics.put(MetricNames.TOTAL_TASK_DURATION_NANOS, String.valueOf(durationNanos));
+
+ final long durationSeconds = TimeUnit.SECONDS.convert(durationNanos, TimeUnit.NANOSECONDS);
+ metrics.put(MetricNames.TOTAL_TASK_DURATION_SECONDS, String.valueOf(durationSeconds));
+
return metrics;
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/8e2663c5/nifi-nar-bundles/nifi-ambari-bundle/nifi-ambari-reporting-task/src/test/java/org/apache/nifi/reporting/ambari/metrics/TestMetricsService.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-ambari-bundle/nifi-ambari-reporting-task/src/test/java/org/apache/nifi/reporting/ambari/metrics/TestMetricsService.java b/nifi-nar-bundles/nifi-ambari-bundle/nifi-ambari-reporting-task/src/test/java/org/apache/nifi/reporting/ambari/metrics/TestMetricsService.java
index 3f6be06..e8cc792 100644
--- a/nifi-nar-bundles/nifi-ambari-bundle/nifi-ambari-reporting-task/src/test/java/org/apache/nifi/reporting/ambari/metrics/TestMetricsService.java
+++ b/nifi-nar-bundles/nifi-ambari-bundle/nifi-ambari-reporting-task/src/test/java/org/apache/nifi/reporting/ambari/metrics/TestMetricsService.java
@@ -71,7 +71,8 @@ public class TestMetricsService {
Assert.assertTrue(metrics.containsKey(MetricNames.BYTES_READ));
Assert.assertTrue(metrics.containsKey(MetricNames.BYTES_WRITTEN));
Assert.assertTrue(metrics.containsKey(MetricNames.ACTIVE_THREADS));
- Assert.assertTrue(metrics.containsKey(MetricNames.TOTAL_TASK_DURATION));
+ Assert.assertTrue(metrics.containsKey(MetricNames.TOTAL_TASK_DURATION_SECONDS));
+ Assert.assertTrue(metrics.containsKey(MetricNames.TOTAL_TASK_DURATION_NANOS));
}
@Test