diff options
| author | Kirill Zakharenko <earwin@gmail.com> | 2020-04-23 17:33:12 +0300 |
|---|---|---|
| committer | Kirill Zakharenko <earwin@gmail.com> | 2020-05-10 00:32:44 +0300 |
| commit | 0ae0fa1623ced46edf912a1084232ade55dbfffb (patch) | |
| tree | b6f3cfa1b61cd66e427609c56379d86e7fa3ab34 | |
| parent | f5bdef4efd35b53f5472bf39037614088166fa8b (diff) | |
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
| -rw-r--r-- | src/stats_statsd.c | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/src/stats_statsd.c b/src/stats_statsd.c index c3f739e2..d4496677 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) { |