From 7adf6ace92711e3059d9e4c07c1f01b35a2edeee Mon Sep 17 00:00:00 2001
From: Stefan Mititelu <stefan-cristian.mititelu@1and1.ro>
Date: Thu, 16 Dec 2021 11:10:36 +0200
Subject: [PATCH] Add 'seconds' to some stats duration

---
 daemon/statistics.c |  4 ++--
 t/test-stats.c      | 28 ++++++++++++++--------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/daemon/statistics.c b/daemon/statistics.c
index 662ebc0e2..e7a4d07f8 100644
--- a/daemon/statistics.c
+++ b/daemon/statistics.c
@@ -461,7 +461,7 @@ GQueue *statistics_gather_metrics(void) {
 	PROM("zero_packet_streams_total", "counter");
 	METRIC("onewaystreams", "Total number of 1-way streams", UINT64F, UINT64F,atomic64_get(&rtpe_stats_cumulative.oneway_stream_sess));
 	PROM("one_way_sessions_total", "counter");
-	METRICva("avgcallduration", "Average call duration", "%" TIME_T_INT_FMT ".%06" TIME_T_INT_FMT, "%" TIME_T_INT_FMT ".%06" TIME_T_INT_FMT, avg.tv_sec, avg.tv_usec);
+	METRICva("avgcallduration", "Average call duration", "%" TIME_T_INT_FMT ".%06" TIME_T_INT_FMT, "%" TIME_T_INT_FMT ".%06" TIME_T_INT_FMT " seconds", avg.tv_sec, avg.tv_usec);
 
 	calls_dur_iv = (double) atomic64_get_na(&rtpe_stats_graphite_interval.total_calls_duration) / 1000000.0;
 	min_sess_iv = atomic64_get(&rtpe_stats_gauge_graphite_min_max_interval.min.total_sessions);
@@ -472,7 +472,7 @@ GQueue *statistics_gather_metrics(void) {
 	HEADER("intervalstatistics", "Graphite interval statistics (last reported values to graphite):");
 	HEADER("{", NULL);
 
-	METRICva("totalcallsduration", "Total calls duration", "%.6f", "%.6f", calls_dur_iv);
+	METRICva("totalcallsduration", "Total calls duration", "%.6f", "%.6f seconds", calls_dur_iv);
 	HEADER(NULL, "");
 
 	METRIC("minmanagedsessions", "Min managed sessions", UINT64F, UINT64F, min_sess_iv);
diff --git a/t/test-stats.c b/t/test-stats.c
index d2d5e6c65..d9df7af76 100644
--- a/t/test-stats.c
+++ b/t/test-stats.c
@@ -428,7 +428,7 @@ int main(void) {
 			"0\n"
 			"Average call duration\n"
 			"avgcallduration\n"
-			"0.000000\n"
+			"0.000000 seconds\n"
 			"0.000000\n"
 			"\n"
 			"\n"
@@ -438,7 +438,7 @@ int main(void) {
 			"{\n"
 			"Total calls duration\n"
 			"totalcallsduration\n"
-			"0.000000\n"
+			"0.000000 seconds\n"
 			"0.000000\n"
 			"\n"
 			"Min managed sessions\n"
@@ -1266,7 +1266,7 @@ int main(void) {
 			"0\n"
 			"Average call duration\n"
 			"avgcallduration\n"
-			"0.000000\n"
+			"0.000000 seconds\n"
 			"0.000000\n"
 			"\n"
 			"\n"
@@ -1276,7 +1276,7 @@ int main(void) {
 			"{\n"
 			"Total calls duration\n"
 			"totalcallsduration\n"
-			"0.000000\n"
+			"0.000000 seconds\n"
 			"0.000000\n"
 			"\n"
 			"Min managed sessions\n"
@@ -2101,7 +2101,7 @@ int main(void) {
 			"0\n"
 			"Average call duration\n"
 			"avgcallduration\n"
-			"0.000000\n"
+			"0.000000 seconds\n"
 			"0.000000\n"
 			"\n"
 			"\n"
@@ -2111,7 +2111,7 @@ int main(void) {
 			"{\n"
 			"Total calls duration\n"
 			"totalcallsduration\n"
-			"0.000000\n"
+			"0.000000 seconds\n"
 			"0.000000\n"
 			"\n"
 			"Min managed sessions\n"
@@ -2949,7 +2949,7 @@ int main(void) {
 			"0\n"
 			"Average call duration\n"
 			"avgcallduration\n"
-			"0.000000\n"
+			"0.000000 seconds\n"
 			"0.000000\n"
 			"\n"
 			"\n"
@@ -2959,7 +2959,7 @@ int main(void) {
 			"{\n"
 			"Total calls duration\n"
 			"totalcallsduration\n"
-			"0.000000\n"
+			"0.000000 seconds\n"
 			"0.000000\n"
 			"\n"
 			"Min managed sessions\n"
@@ -3792,7 +3792,7 @@ int main(void) {
 			"0\n"
 			"Average call duration\n"
 			"avgcallduration\n"
-			"0.000000\n"
+			"0.000000 seconds\n"
 			"0.000000\n"
 			"\n"
 			"\n"
@@ -3802,7 +3802,7 @@ int main(void) {
 			"{\n"
 			"Total calls duration\n"
 			"totalcallsduration\n"
-			"0.000000\n"
+			"0.000000 seconds\n"
 			"0.000000\n"
 			"\n"
 			"Min managed sessions\n"
@@ -4630,7 +4630,7 @@ int main(void) {
 			"0\n"
 			"Average call duration\n"
 			"avgcallduration\n"
-			"0.000000\n"
+			"0.000000 seconds\n"
 			"0.000000\n"
 			"\n"
 			"\n"
@@ -4640,7 +4640,7 @@ int main(void) {
 			"{\n"
 			"Total calls duration\n"
 			"totalcallsduration\n"
-			"186.000000\n"
+			"186.000000 seconds\n"
 			"186.000000\n"
 			"\n"
 			"Min managed sessions\n"
@@ -5470,7 +5470,7 @@ int main(void) {
 			"0\n"
 			"Average call duration\n"
 			"avgcallduration\n"
-			"93.000000\n"
+			"93.000000 seconds\n"
 			"93.000000\n"
 			"\n"
 			"\n"
@@ -5480,7 +5480,7 @@ int main(void) {
 			"{\n"
 			"Total calls duration\n"
 			"totalcallsduration\n"
-			"0.000000\n"
+			"0.000000 seconds\n"
 			"0.000000\n"
 			"\n"
 			"Min managed sessions\n"