diff --git a/daemon/call.c b/daemon/call.c index 7fda8f807..e84e72623 100644 --- a/daemon/call.c +++ b/daemon/call.c @@ -3159,7 +3159,7 @@ out: void add_total_calls_duration_in_interval(struct timeval *interval_tv) { struct timeval ongoing_calls_dur = add_ongoing_calls_dur_in_interval( &rtpe_latest_graphite_interval_start, interval_tv); - RTPE_STATS_ADD(total_calls_duration, timeval_us(&ongoing_calls_dur)); + RTPE_STATS_ADD(total_calls_duration_intv, timeval_us(&ongoing_calls_dur)); } static struct timeval add_ongoing_calls_dur_in_interval(struct timeval *interval_start, diff --git a/daemon/graphite.c b/daemon/graphite.c index b7d5e662e..f8258284a 100644 --- a/daemon/graphite.c +++ b/daemon/graphite.c @@ -94,7 +94,7 @@ GString *print_graphite_data(void) { (double) atomic64_get(&rtpe_stats_gauge_graphite_min_max_interval.avg.ng_command_times[i]) / 1000000.0); } - GPF("call_dur %.6f", (double) atomic64_get_na(&rtpe_stats_graphite_interval.total_calls_duration) / 1000000.0); + GPF("call_dur %.6f", (double) atomic64_get_na(&rtpe_stats_graphite_interval.total_calls_duration_intv) / 1000000.0); struct timeval avg_duration; uint64_t managed_sess = atomic64_get_na(&rtpe_stats_graphite_interval.managed_sess); if (managed_sess) @@ -182,7 +182,7 @@ GString *print_graphite_data(void) { ilog(LOG_DEBUG, "min_sessions:%llu max_sessions:%llu, call_dur_per_interval:%.6f at time %llu\n", (unsigned long long) atomic64_get_na(&rtpe_stats_gauge_graphite_min_max_interval.min.total_sessions), (unsigned long long) atomic64_get_na(&rtpe_stats_gauge_graphite_min_max_interval.max.total_sessions), - (double) atomic64_get_na(&rtpe_stats_graphite_interval.total_calls_duration) / 1000000.0, + (double) atomic64_get_na(&rtpe_stats_graphite_interval.total_calls_duration_intv) / 1000000.0, (unsigned long long ) rtpe_now.tv_sec); for (int i = 0; i < NGC_COUNT; i++) { diff --git a/daemon/statistics.c b/daemon/statistics.c index e7a4d07f8..8272f5233 100644 --- a/daemon/statistics.c +++ b/daemon/statistics.c @@ -463,7 +463,7 @@ GQueue *statistics_gather_metrics(void) { 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 " seconds", avg.tv_sec, avg.tv_usec); - calls_dur_iv = (double) atomic64_get_na(&rtpe_stats_graphite_interval.total_calls_duration) / 1000000.0; + calls_dur_iv = (double) atomic64_get_na(&rtpe_stats_graphite_interval.total_calls_duration_intv) / 1000000.0; min_sess_iv = atomic64_get(&rtpe_stats_gauge_graphite_min_max_interval.min.total_sessions); max_sess_iv = atomic64_get(&rtpe_stats_gauge_graphite_min_max_interval.max.total_sessions); diff --git a/include/counter_stats_fields.inc b/include/counter_stats_fields.inc index 985294bf4..e9faae38a 100644 --- a/include/counter_stats_fields.inc +++ b/include/counter_stats_fields.inc @@ -17,4 +17,4 @@ F(forced_term_sess) F(nopacket_relayed_sess) F(oneway_stream_sess) F(call_duration) -F(total_calls_duration) +F(total_calls_duration_intv)