projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'github/pr/1952'
[collectd.git]
/
src
/
statsd.c
diff --git
a/src/statsd.c
b/src/statsd.c
index
040181a
..
491fe42
100644
(file)
--- a/
src/statsd.c
+++ b/
src/statsd.c
@@
-28,7
+28,6
@@
#include "plugin.h"
#include "common.h"
#include "plugin.h"
#include "common.h"
-#include "configfile.h"
#include "utils_avltree.h"
#include "utils_latency.h"
#include "utils_avltree.h"
#include "utils_latency.h"
@@
-753,12
+752,10
@@
static int statsd_metric_clear_set_unsafe (statsd_metric_t *metric) /* {{{ */
/* Must hold metrics_lock when calling this function. */
static int statsd_metric_submit_unsafe (char const *name, statsd_metric_t *metric) /* {{{ */
{
/* Must hold metrics_lock when calling this function. */
static int statsd_metric_submit_unsafe (char const *name, statsd_metric_t *metric) /* {{{ */
{
- value_t values[1];
value_list_t vl = VALUE_LIST_INIT;
value_list_t vl = VALUE_LIST_INIT;
- vl.values =
values
;
+ vl.values =
&(value_t) { .gauge = NAN }
;
vl.values_len = 1;
vl.values_len = 1;
- sstrncpy (vl.host, hostname_g, sizeof (vl.host));
sstrncpy (vl.plugin, "statsd", sizeof (vl.plugin));
if (metric->type == STATSD_GAUGE)
sstrncpy (vl.plugin, "statsd", sizeof (vl.plugin));
if (metric->type == STATSD_GAUGE)
@@
-773,7
+770,7
@@
static int statsd_metric_submit_unsafe (char const *name, statsd_metric_t *metri
sstrncpy (vl.type_instance, name, sizeof (vl.type_instance));
if (metric->type == STATSD_GAUGE)
sstrncpy (vl.type_instance, name, sizeof (vl.type_instance));
if (metric->type == STATSD_GAUGE)
- values[0].gauge = (gauge_t) metric->value;
+ v
l.v
alues[0].gauge = (gauge_t) metric->value;
else if (metric->type == STATSD_TIMER)
{
_Bool have_events = (metric->updates_num > 0);
else if (metric->type == STATSD_TIMER)
{
_Bool have_events = (metric->updates_num > 0);
@@
-783,7
+780,7
@@
static int statsd_metric_submit_unsafe (char const *name, statsd_metric_t *metri
ssnprintf (vl.type_instance, sizeof (vl.type_instance),
"%s-average", name);
ssnprintf (vl.type_instance, sizeof (vl.type_instance),
"%s-average", name);
- values[0].gauge = have_events
+ v
l.v
alues[0].gauge = have_events
? CDTIME_T_TO_DOUBLE (latency_counter_get_average (metric->latency))
: NAN;
plugin_dispatch_values (&vl);
? CDTIME_T_TO_DOUBLE (latency_counter_get_average (metric->latency))
: NAN;
plugin_dispatch_values (&vl);
@@
-791,7
+788,7
@@
static int statsd_metric_submit_unsafe (char const *name, statsd_metric_t *metri
if (conf_timer_lower) {
ssnprintf (vl.type_instance, sizeof (vl.type_instance),
"%s-lower", name);
if (conf_timer_lower) {
ssnprintf (vl.type_instance, sizeof (vl.type_instance),
"%s-lower", name);
- values[0].gauge = have_events
+ v
l.v
alues[0].gauge = have_events
? CDTIME_T_TO_DOUBLE (latency_counter_get_min (metric->latency))
: NAN;
plugin_dispatch_values (&vl);
? CDTIME_T_TO_DOUBLE (latency_counter_get_min (metric->latency))
: NAN;
plugin_dispatch_values (&vl);
@@
-800,7
+797,7
@@
static int statsd_metric_submit_unsafe (char const *name, statsd_metric_t *metri
if (conf_timer_upper) {
ssnprintf (vl.type_instance, sizeof (vl.type_instance),
"%s-upper", name);
if (conf_timer_upper) {
ssnprintf (vl.type_instance, sizeof (vl.type_instance),
"%s-upper", name);
- values[0].gauge = have_events
+ v
l.v
alues[0].gauge = have_events
? CDTIME_T_TO_DOUBLE (latency_counter_get_max (metric->latency))
: NAN;
plugin_dispatch_values (&vl);
? CDTIME_T_TO_DOUBLE (latency_counter_get_max (metric->latency))
: NAN;
plugin_dispatch_values (&vl);
@@
-809,7
+806,7
@@
static int statsd_metric_submit_unsafe (char const *name, statsd_metric_t *metri
if (conf_timer_sum) {
ssnprintf (vl.type_instance, sizeof (vl.type_instance),
"%s-sum", name);
if (conf_timer_sum) {
ssnprintf (vl.type_instance, sizeof (vl.type_instance),
"%s-sum", name);
- values[0].gauge = have_events
+ v
l.v
alues[0].gauge = have_events
? CDTIME_T_TO_DOUBLE (latency_counter_get_sum (metric->latency))
: NAN;
plugin_dispatch_values (&vl);
? CDTIME_T_TO_DOUBLE (latency_counter_get_sum (metric->latency))
: NAN;
plugin_dispatch_values (&vl);
@@
-819,7
+816,7
@@
static int statsd_metric_submit_unsafe (char const *name, statsd_metric_t *metri
{
ssnprintf (vl.type_instance, sizeof (vl.type_instance),
"%s-percentile-%.0f", name, conf_timer_percentile[i]);
{
ssnprintf (vl.type_instance, sizeof (vl.type_instance),
"%s-percentile-%.0f", name, conf_timer_percentile[i]);
- values[0].gauge = have_events
+ v
l.v
alues[0].gauge = have_events
? CDTIME_T_TO_DOUBLE (latency_counter_get_percentile (metric->latency, conf_timer_percentile[i]))
: NAN;
plugin_dispatch_values (&vl);
? CDTIME_T_TO_DOUBLE (latency_counter_get_percentile (metric->latency, conf_timer_percentile[i]))
: NAN;
plugin_dispatch_values (&vl);
@@
-831,7
+828,7
@@
static int statsd_metric_submit_unsafe (char const *name, statsd_metric_t *metri
sstrncpy (vl.type, "gauge", sizeof (vl.type));
ssnprintf (vl.type_instance, sizeof (vl.type_instance),
"%s-count", name);
sstrncpy (vl.type, "gauge", sizeof (vl.type));
ssnprintf (vl.type_instance, sizeof (vl.type_instance),
"%s-count", name);
- values[0].gauge = latency_counter_get_num (metric->latency);
+ v
l.v
alues[0].gauge = latency_counter_get_num (metric->latency);
plugin_dispatch_values (&vl);
}
plugin_dispatch_values (&vl);
}
@@
-841,9
+838,9
@@
static int statsd_metric_submit_unsafe (char const *name, statsd_metric_t *metri
else if (metric->type == STATSD_SET)
{
if (metric->set == NULL)
else if (metric->type == STATSD_SET)
{
if (metric->set == NULL)
- values[0].gauge = 0.0;
+ v
l.v
alues[0].gauge = 0.0;
else
else
- values[0].gauge = (gauge_t) c_avl_size (metric->set);
+ v
l.v
alues[0].gauge = (gauge_t) c_avl_size (metric->set);
}
else { /* STATSD_COUNTER */
gauge_t delta = nearbyint (metric->value);
}
else { /* STATSD_COUNTER */
gauge_t delta = nearbyint (metric->value);
@@
-855,7
+852,7
@@
static int statsd_metric_submit_unsafe (char const *name, statsd_metric_t *metri
if (conf_counter_sum)
{
sstrncpy (vl.type, "count", sizeof (vl.type));
if (conf_counter_sum)
{
sstrncpy (vl.type, "count", sizeof (vl.type));
- values[0].gauge = delta;
+ v
l.v
alues[0].gauge = delta;
plugin_dispatch_values (&vl);
/* restore vl.type */
plugin_dispatch_values (&vl);
/* restore vl.type */
@@
-867,7
+864,7
@@
static int statsd_metric_submit_unsafe (char const *name, statsd_metric_t *metri
metric->value -= delta;
metric->counter += (derive_t) delta;
metric->value -= delta;
metric->counter += (derive_t) delta;
- values[0].derive = metric->counter;
+ v
l.v
alues[0].derive = metric->counter;
}
return (plugin_dispatch_values (&vl));
}
return (plugin_dispatch_values (&vl));