From 0ae0fa1623ced46edf912a1084232ade55dbfffb Mon Sep 17 00:00:00 2001 From: Kirill Zakharenko Date: Thu, 23 Apr 2020 17:33:12 +0300 Subject: [PATCH] statsd: fix rendering for groups with idx==0 while skipping `0` might be visually pleasant for non-repeating groups, e.g.: bsc.assignment.completed it makes metrics parsing very awkward for repeating groups, e.g.: bts.chreq.total bts.1.chreq.total bts.2.chreq.total and since nobody's going to look at raw statsd stream anyway, we can live with some extra zeroes Change-Id: Id294202fbcebe0b6b155c7f267b2da73af20adf4 --- src/stats_statsd.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/src/stats_statsd.c b/src/stats_statsd.c index c3f739e22..d44966773 100644 --- a/src/stats_statsd.c +++ b/src/stats_statsd.c @@ -99,24 +99,16 @@ static int osmo_stats_reporter_statsd_send(struct osmo_stats_reporter *srep, int old_len = msgb_length(srep->buffer); if (prefix) { - if (name1) { - if (index1 != 0) - fmt = "%1$s.%2$s.%6$u.%3$s:%4$d|%5$s"; - else - fmt = "%1$s.%2$s.%3$s:%4$d|%5$s"; - } else { + if (name1) + fmt = "%1$s.%2$s.%6$u.%3$s:%4$d|%5$s"; + else fmt = "%1$s.%2$0.0s%3$s:%4$d|%5$s"; - } } else { prefix = ""; - if (name1) { - if (index1 != 0) - fmt = "%1$s%2$s.%6$u.%3$s:%4$d|%5$s"; - else - fmt = "%1$s%2$s.%3$s:%4$d|%5$s"; - } else { + if (name1) + fmt = "%1$s%2$s.%6$u.%3$s:%4$d|%5$s"; + else fmt = "%1$s%2$0.0s%3$s:%4$d|%5$s"; - } } if (srep->agg_enabled) {