<p>Daniel Willmann has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/13807">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">stats: Don't report osmo_counters<br><br>In the case of statsd this has never worked because it was reported as a<br>rate (c)ounter and not a (g)auge.<br>Nowadays we don't seem to have so many osmo_counters anyway, so let's<br>just remove support for them here and migrate existing ones to<br>osmo_stat_item.<br><br>Change-Id: I78578122aaea07d541b377ad39dd830c38c55e7a<br>---<br>M src/stats.c<br>1 file changed, 4 insertions(+), 19 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/07/13807/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/stats.c b/src/stats.c</span><br><span>index b5adbf2..729301f 100644</span><br><span>--- a/src/stats.c</span><br><span>+++ b/src/stats.c</span><br><span>@@ -667,30 +667,15 @@</span><br><span>         return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/*** osmo counter support ***/</span><br><span style="color: hsl(120, 100%, 40%);">+/*** osmo counter support (deprecated) ***/</span><br><span> </span><br><span> static int handle_counter(struct osmo_counter *counter, void *sctx_)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-  struct osmo_stats_reporter *srep;</span><br><span style="color: hsl(0, 100%, 40%);">-       struct rate_ctr_desc desc = {0};</span><br><span style="color: hsl(0, 100%, 40%);">-        /* Fake a rate counter description */</span><br><span style="color: hsl(0, 100%, 40%);">-   desc.name = counter->name;</span><br><span style="color: hsl(0, 100%, 40%);">-   desc.description = counter->description;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- int delta = osmo_counter_difference(counter);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLSTATS, LOGL_NOTICE,</span><br><span style="color: hsl(120, 100%, 40%);">+            "osmo_counter stats export not reported: name=%s desc=%s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+                counter->name, counter->description);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- llist_for_each_entry(srep, &osmo_stats_reporter_list, list) {</span><br><span style="color: hsl(0, 100%, 40%);">-               if (!srep->running)</span><br><span style="color: hsl(0, 100%, 40%);">-                  continue;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-               if (delta == 0 && !srep->force_single_flush)</span><br><span style="color: hsl(0, 100%, 40%);">-                 continue;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-               osmo_stats_reporter_send_counter(srep, NULL, &desc,</span><br><span style="color: hsl(0, 100%, 40%);">-                 counter->value, delta);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-              /* TODO: handle result (log?, inc counter(!)?) */</span><br><span style="color: hsl(0, 100%, 40%);">-       }</span><br><span> </span><br><span>        return 0;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13807">change 13807</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/13807"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I78578122aaea07d541b377ad39dd830c38c55e7a </div>
<div style="display:none"> Gerrit-Change-Number: 13807 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Daniel Willmann <dwillmann@sysmocom.de> </div>