Tree wide: Rename "up_down_counter_fp" to "up_down_fp".

diff --git a/src/daemon/metric.c b/src/daemon/metric.c
index ae38396391705f621c94234bd04329345a2f09d4..eea2fd77967329c44fd3c7c535c1fcac97de8b9f 100644 (file)
--- a/src/daemon/metric.c
+++ b/src/daemon/metric.c
@@ -62,11 +62,11 @@ int value_marshal_text(strbuf_t *buf, value_t v, metric_type_t type) {
     return strbuf_printf(buf, GAUGE_FORMAT, v.fpcounter);
   case METRIC_TYPE_UP_DOWN:
     return strbuf_printf(buf, "%" PRId64, v.up_down);
-  case METRIC_TYPE_UP_DOWN_COUNTER_FP:
-    if (isnan(v.up_down_counter_fp)) {
+  case METRIC_TYPE_UP_DOWN_FP:
+    if (isnan(v.up_down_fp)) {
       return strbuf_print(buf, "nan");
     }
-    return strbuf_printf(buf, GAUGE_FORMAT, v.up_down_counter_fp);
+    return strbuf_printf(buf, GAUGE_FORMAT, v.up_down_fp);
   case METRIC_TYPE_UNTYPED:
     break;
   }

diff --git a/src/daemon/metric.h b/src/daemon/metric.h
index fbae74fe1d99935747cbd287bfd0414ecb2f799b..2097dee9191d0655269585876c76d634e84c90ec 100644 (file)
--- a/src/daemon/metric.h
+++ b/src/daemon/metric.h
@@ -52,18 +52,18 @@ typedef enum {
   // (meaningfully) be summed up. Examples are filesystem space used and
   // physical memory.
   METRIC_TYPE_UP_DOWN = METRIC_ATTR_CUMULATIVE,
-  // METRIC_TYPE_UP_DOWN_COUNTER_FP are absolute floating point metrics that can
+  // METRIC_TYPE_UP_DOWN_FP are absolute floating point metrics that can
   // (meaningfully) be summed up.
-  METRIC_TYPE_UP_DOWN_COUNTER_FP = METRIC_ATTR_DOUBLE | METRIC_ATTR_CUMULATIVE,
+  METRIC_TYPE_UP_DOWN_FP = METRIC_ATTR_DOUBLE | METRIC_ATTR_CUMULATIVE,
 } metric_type_t;
 
 #define METRIC_TYPE_TO_STRING(t)                                               \
-  (t == METRIC_TYPE_GAUGE)                ? "gauge"                            \
-  : (t == METRIC_TYPE_COUNTER)            ? "counter"                          \
-  : (t == METRIC_TYPE_FPCOUNTER)          ? "fpcounter"                        \
-  : (t == METRIC_TYPE_UP_DOWN)            ? "up_down"                          \
-  : (t == METRIC_TYPE_UP_DOWN_COUNTER_FP) ? "up_down_counter_fp"               \
-                                          : "unknown"
+  (t == METRIC_TYPE_GAUGE)        ? "gauge"                                    \
+  : (t == METRIC_TYPE_COUNTER)    ? "counter"                                  \
+  : (t == METRIC_TYPE_FPCOUNTER)  ? "fpcounter"                                \
+  : (t == METRIC_TYPE_UP_DOWN)    ? "up_down"                                  \
+  : (t == METRIC_TYPE_UP_DOWN_FP) ? "up_down_fp"                               \
+                                  : "unknown"
 
 #define IS_DOUBLE(t) ((t)&METRIC_ATTR_DOUBLE)
 #define IS_MONOTONIC(t) ((t)&METRIC_ATTR_MONOTONIC)
@@ -80,7 +80,7 @@ union value_u {
   counter_t counter;
   fpcounter_t fpcounter;
   up_down_counter_t up_down;
-  up_down_counter_fp_t up_down_counter_fp;
+  up_down_counter_fp_t up_down_fp;
   // For collectd 5 compatiblity. Treated the same as up_down.
   derive_t derive;
 };

diff --git a/src/daemon/utils_cache.c b/src/daemon/utils_cache.c
index f7b6410b829806ab811e898119b500b8ab492d9c..51d3ba3342aac19d3cb6ee1e099d1ae60221e180 100644 (file)
--- a/src/daemon/utils_cache.c
+++ b/src/daemon/utils_cache.c
@@ -323,8 +323,8 @@ static int uc_update_rate(metric_t const *m, cache_entry_t *ce) {
     return 0;
   }
 
-  case METRIC_TYPE_UP_DOWN_COUNTER_FP: {
-    ce->values_gauge = (gauge_t)m->value.up_down_counter_fp;
+  case METRIC_TYPE_UP_DOWN_FP: {
+    ce->values_gauge = (gauge_t)m->value.up_down_fp;
     return 0;
   }
 
@@ -485,8 +485,8 @@ int uc_get_rate(metric_t const *m, gauge_t *ret) {
   case METRIC_TYPE_UP_DOWN:
     *ret = (gauge_t)m->value.up_down;
     return 0;
-  case METRIC_TYPE_UP_DOWN_COUNTER_FP:
-    *ret = (gauge_t)m->value.up_down_counter_fp;
+  case METRIC_TYPE_UP_DOWN_FP:
+    *ret = (gauge_t)m->value.up_down_fp;
     return 0;
   case METRIC_TYPE_UNTYPED:
     return EINVAL;

diff --git a/src/daemon/utils_cache_test.c b/src/daemon/utils_cache_test.c
index 64f7728c64e00a4ca5af4d0e185aa468c6709f9c..4d78c742921945c94e046e736c55d688cb5326a7 100644 (file)
--- a/src/daemon/utils_cache_test.c
+++ b/src/daemon/utils_cache_test.c
@@ -123,21 +123,21 @@ DEF_TEST(uc_get_rate) {
           .want = 215,
       },
       {
-          .name = "up_down_counter_fp",
-          .first_value = (value_t){.up_down_counter_fp = 1.0},
-          .second_value = (value_t){.up_down_counter_fp = 2.0},
+          .name = "up_down_fp",
+          .first_value = (value_t){.up_down_fp = 1.0},
+          .second_value = (value_t){.up_down_fp = 2.0},
           .first_time = TIME_T_TO_CDTIME_T(100),
           .second_time = TIME_T_TO_CDTIME_T(110),
-          .type = METRIC_TYPE_UP_DOWN_COUNTER_FP,
+          .type = METRIC_TYPE_UP_DOWN_FP,
           .want = 2.0,
       },
       {
-          .name = "decreasing up_down_counter_fp",
-          .first_value = (value_t){.up_down_counter_fp = 100.0},
-          .second_value = (value_t){.up_down_counter_fp = 21.5},
+          .name = "decreasing up_down_fp",
+          .first_value = (value_t){.up_down_fp = 100.0},
+          .second_value = (value_t){.up_down_fp = 21.5},
           .first_time = TIME_T_TO_CDTIME_T(100),
           .second_time = TIME_T_TO_CDTIME_T(110),
-          .type = METRIC_TYPE_UP_DOWN_COUNTER_FP,
+          .type = METRIC_TYPE_UP_DOWN_FP,
           .want = 21.5,
       },
   };

diff --git a/src/utils/cmds/putmetric.c b/src/utils/cmds/putmetric.c
index 3e93854af8a66d85889f78015e77676139f697f4..9b07f8723f082158605c53045aa035246addeba2 100644 (file)
--- a/src/utils/cmds/putmetric.c
+++ b/src/utils/cmds/putmetric.c
@@ -51,7 +51,7 @@ static int set_option(metric_t *m, char const *key, char const *value,
     } else if (strcasecmp("UP_DOWN_COUNTER", value) == 0) {
       m->family->type = METRIC_TYPE_UP_DOWN;
     } else if (strcasecmp("UP_DOWN_COUNTER_FP", value) == 0) {
-      m->family->type = METRIC_TYPE_UP_DOWN_COUNTER_FP;
+      m->family->type = METRIC_TYPE_UP_DOWN_FP;
     } else {
       return CMD_ERROR;
     }
@@ -260,7 +260,7 @@ int cmd_format_putmetric(strbuf_t *buf, metric_t const *m) { /* {{{ */
   case METRIC_TYPE_UP_DOWN:
     strbuf_print(buf, " type=UP_DOWN_COUNTER");
     break;
-  case METRIC_TYPE_UP_DOWN_COUNTER_FP:
+  case METRIC_TYPE_UP_DOWN_FP:
     strbuf_print(buf, " type=UP_DOWN_COUNTER_FP");
     break;
   case METRIC_TYPE_UNTYPED:

diff --git a/src/utils/common/common.c b/src/utils/common/common.c
index d503d9e779b5ac5e976e789d778a88df84889a6b..f7b5dbcfaa7c994719d84137c30e79fcabd76269 100644 (file)
--- a/src/utils/common/common.c
+++ b/src/utils/common/common.c
@@ -972,9 +972,8 @@ int parse_value(char const *value, value_t *ret_value, metric_type_t type) {
     ret_value->up_down = (up_down_counter_t)strtoll(value, &endptr, 0);
     break;
 
-  case METRIC_TYPE_UP_DOWN_COUNTER_FP:
-    ret_value->up_down_counter_fp =
-        (up_down_counter_fp_t)strtod(value, &endptr);
+  case METRIC_TYPE_UP_DOWN_FP:
+    ret_value->up_down_fp = (up_down_counter_fp_t)strtod(value, &endptr);
     break;
 
   case METRIC_TYPE_UNTYPED:
@@ -1243,8 +1242,8 @@ int rate_to_value(value_t *ret_value, gauge_t rate, /* {{{ */
       state->last_value.up_down = (up_down_counter_t)floor(rate);
       state->residual = rate - ((gauge_t)state->last_value.up_down);
       break;
-    case METRIC_TYPE_UP_DOWN_COUNTER_FP:
-      state->last_value.up_down_counter_fp = (up_down_counter_fp_t)rate;
+    case METRIC_TYPE_UP_DOWN_FP:
+      state->last_value.up_down_fp = (up_down_counter_fp_t)rate;
       state->residual = 0;
       break;
     case METRIC_TYPE_UNTYPED:
@@ -1278,9 +1277,9 @@ int rate_to_value(value_t *ret_value, gauge_t rate, /* {{{ */
     state->residual = delta_gauge - ((gauge_t)delta);
     break;
   }
-  case METRIC_TYPE_UP_DOWN_COUNTER_FP: {
+  case METRIC_TYPE_UP_DOWN_FP: {
     up_down_counter_fp_t delta = (up_down_counter_fp_t)delta_gauge;
-    state->last_value.up_down_counter_fp += delta;
+    state->last_value.up_down_fp += delta;
     state->residual = 0;
     break;
   }
@@ -1319,9 +1318,8 @@ static int calculate_rate(gauge_t *ret_rate, value_t value, metric_type_t type,
     *ret_rate = ((gauge_t)diff) / ((gauge_t)interval);
     return 0;
   }
-  case METRIC_TYPE_UP_DOWN_COUNTER_FP: {
-    up_down_counter_fp_t diff =
-        value.up_down_counter_fp - state->last_value.up_down_counter_fp;
+  case METRIC_TYPE_UP_DOWN_FP: {
+    up_down_counter_fp_t diff = value.up_down_fp - state->last_value.up_down_fp;
     *ret_rate = ((gauge_t)diff) / ((gauge_t)interval);
     return 0;
   }

diff --git a/src/utils/common/common_test.c b/src/utils/common/common_test.c
index 54b46b2d690330949c2f018a8b8662bf1d895931..90fe1b090b19ab3bee3987da5ce7065d6b7291f5 100644 (file)
--- a/src/utils/common/common_test.c
+++ b/src/utils/common/common_test.c
@@ -452,11 +452,9 @@ DEF_TEST(rate_to_value) {
       EXPECT_EQ_UINT64(cases[i].want.up_down, got.up_down);
       EXPECT_EQ_UINT64(cases[i].want.up_down, state.last_value.up_down);
       break;
-    case METRIC_TYPE_UP_DOWN_COUNTER_FP:
-      EXPECT_EQ_DOUBLE(cases[i].want.up_down_counter_fp,
-                       got.up_down_counter_fp);
-      EXPECT_EQ_UINT64(cases[i].want.up_down_counter_fp,
-                       state.last_value.up_down_counter_fp);
+    case METRIC_TYPE_UP_DOWN_FP:
+      EXPECT_EQ_DOUBLE(cases[i].want.up_down_fp, got.up_down_fp);
+      EXPECT_EQ_UINT64(cases[i].want.up_down_fp, state.last_value.up_down_fp);
       break;
     case METRIC_TYPE_UNTYPED:
       LOG(false, "invalid metric type");

diff --git a/src/utils/format_influxdb/format_influxdb.c b/src/utils/format_influxdb/format_influxdb.c
index 2e6d5187278cf7aaebef4fc7edcbaf5054a576ea..d85408139e8a3b1a37b25cc0de7d594ed6966805 100644 (file)
--- a/src/utils/format_influxdb/format_influxdb.c
+++ b/src/utils/format_influxdb/format_influxdb.c
@@ -74,8 +74,8 @@ static int format_metric_value(strbuf_t *sb, metric_t const *m,
   }
 
   if ((m->family->type == METRIC_TYPE_GAUGE && isnan(m->value.gauge)) ||
-      (m->family->type == METRIC_TYPE_UP_DOWN_COUNTER_FP &&
-       isnan(m->value.up_down_counter_fp))) {
+      (m->family->type == METRIC_TYPE_UP_DOWN_FP &&
+       isnan(m->value.up_down_fp))) {
     return EAGAIN;
   }
 

diff --git a/src/utils/format_json/format_json.c b/src/utils/format_json/format_json.c
index c7cefae0bf6b22d57b65e1dbf1846a8d73c41dc7..ce30fd6ae96cae9d531bd1cdd538909ee51450a7 100644 (file)
--- a/src/utils/format_json/format_json.c
+++ b/src/utils/format_json/format_json.c
@@ -167,7 +167,7 @@ static char const *metric_type_to_string(metric_type_t type) {
     return "FPCOUNTER";
   case METRIC_TYPE_UP_DOWN:
     return "UP_DOWN_COUNTER";
-  case METRIC_TYPE_UP_DOWN_COUNTER_FP:
+  case METRIC_TYPE_UP_DOWN_FP:
     return "UP_DOWN_COUNTER_FP";
   case METRIC_TYPE_UNTYPED:
     break;

diff --git a/src/utils/format_json/open_telemetry.c b/src/utils/format_json/open_telemetry.c
index c463dab75fb2dc3f81747da37cb2eff8dfc518f1..a90c1284aa3e3d97f8f536e934a629e994e950f3 100644 (file)
--- a/src/utils/format_json/open_telemetry.c
+++ b/src/utils/format_json/open_telemetry.c
@@ -108,9 +108,9 @@ static int number_data_point(yajl_gen g, metric_t const *m) {
     CHECK(json_add_string(g, "asInt"));
     CHECK(yajl_gen_integer(g, (long long int)m->value.up_down));
     break;
-  case METRIC_TYPE_UP_DOWN_COUNTER_FP:
+  case METRIC_TYPE_UP_DOWN_FP:
     CHECK(json_add_string(g, "asDouble"));
-    CHECK(yajl_gen_integer(g, m->value.up_down_counter_fp));
+    CHECK(yajl_gen_integer(g, m->value.up_down_fp));
     break;
   case METRIC_TYPE_UNTYPED:
     ERROR("format_json_open_telemetry: Unexpected metric type: %d",
@@ -181,7 +181,7 @@ static int metric(yajl_gen g, metric_family_t const *fam) {
   case METRIC_TYPE_COUNTER:
   case METRIC_TYPE_FPCOUNTER:
   case METRIC_TYPE_UP_DOWN:
-  case METRIC_TYPE_UP_DOWN_COUNTER_FP:
+  case METRIC_TYPE_UP_DOWN_FP:
     CHECK(json_add_string(g, "sum"));
     CHECK(sum(g, fam));
     break;

diff --git a/src/utils/format_kairosdb/format_kairosdb.c b/src/utils/format_kairosdb/format_kairosdb.c
index b0d636bbf20c888a2fe6cbd479d081ecd9dbb1b7..f67a245361acce7b5842059e79e6ca3d04d2f975 100644 (file)
--- a/src/utils/format_kairosdb/format_kairosdb.c
+++ b/src/utils/format_kairosdb/format_kairosdb.c
@@ -123,8 +123,8 @@ static int json_add_value(yajl_gen g, metric_t const *m,
   case METRIC_TYPE_UP_DOWN:
     CHECK(yajl_gen_integer(g, (long long int)m->value.up_down));
     return 0;
-  case METRIC_TYPE_UP_DOWN_COUNTER_FP:
-    CHECK(yajl_gen_double(g, m->value.up_down_counter_fp));
+  case METRIC_TYPE_UP_DOWN_FP:
+    CHECK(yajl_gen_double(g, m->value.up_down_fp));
     return 0;
   case METRIC_TYPE_UNTYPED:
     break;

diff --git a/src/utils/format_open_telemetry/format_open_telemetry.cc b/src/utils/format_open_telemetry/format_open_telemetry.cc
index d5c563a30e83b45ee1eb97f43d9f3ff4e9c7a2d6..cdda4afce67203c7424284e82e0961192177a6e5 100644 (file)
--- a/src/utils/format_open_telemetry/format_open_telemetry.cc
+++ b/src/utils/format_open_telemetry/format_open_telemetry.cc
@@ -79,8 +79,8 @@ static void metric_to_number_data_point(NumberDataPoint *dp,
   case METRIC_TYPE_FPCOUNTER:
     dp->set_as_double(m->value.fpcounter);
     return;
-  case METRIC_TYPE_UP_DOWN_COUNTER_FP:
-    dp->set_as_double(m->value.up_down_counter_fp);
+  case METRIC_TYPE_UP_DOWN_FP:
+    dp->set_as_double(m->value.up_down_fp);
     return;
   case METRIC_TYPE_UNTYPED:
     // Fall through. This case signals the compiler that we're checking all
@@ -139,7 +139,7 @@ static void add_metric(ScopeMetrics *sm, metric_family_t const *fam) {
   case METRIC_TYPE_COUNTER:
   case METRIC_TYPE_FPCOUNTER:
   case METRIC_TYPE_UP_DOWN:
-  case METRIC_TYPE_UP_DOWN_COUNTER_FP:
+  case METRIC_TYPE_UP_DOWN_FP:
     set_sum(m, fam);
     return;
   case METRIC_TYPE_UNTYPED:

diff --git a/src/utils/format_stackdriver/format_stackdriver.c b/src/utils/format_stackdriver/format_stackdriver.c
index 242dd172b782243ea7eca2cf204ea6cafa3fd444..bc028eaf1dc041d5b88a780434e476f1867cc6df 100644 (file)
--- a/src/utils/format_stackdriver/format_stackdriver.c
+++ b/src/utils/format_stackdriver/format_stackdriver.c
@@ -176,9 +176,9 @@ static int format_typed_value(yajl_gen gen, metric_t const *m,
     }
     break;
   }
-  case METRIC_TYPE_UP_DOWN_COUNTER_FP: {
+  case METRIC_TYPE_UP_DOWN_FP: {
     int status = json_string(gen, "doubleValue") ||
-                 yajl_gen_double(gen, m->value.up_down_counter_fp);
+                 yajl_gen_double(gen, m->value.up_down_fp);
     if (status != 0) {
       return status;
     }
@@ -204,7 +204,7 @@ static int format_metric_kind(yajl_gen gen, metric_t const *m) {
   switch (m->family->type) {
   case METRIC_TYPE_GAUGE:
   case METRIC_TYPE_UP_DOWN:
-  case METRIC_TYPE_UP_DOWN_COUNTER_FP:
+  case METRIC_TYPE_UP_DOWN_FP:
     return json_string(gen, "GAUGE");
   case METRIC_TYPE_COUNTER:
   case METRIC_TYPE_FPCOUNTER:
@@ -227,7 +227,7 @@ static int format_value_type(yajl_gen gen, metric_t const *m) {
   switch (m->family->type) {
   case METRIC_TYPE_GAUGE:
   case METRIC_TYPE_FPCOUNTER:
-  case METRIC_TYPE_UP_DOWN_COUNTER_FP:
+  case METRIC_TYPE_UP_DOWN_FP:
     return json_string(gen, "DOUBLE");
   case METRIC_TYPE_UP_DOWN:
   case METRIC_TYPE_COUNTER:
@@ -415,8 +415,8 @@ static int format_time_series(yajl_gen gen, metric_t const *m,
     break;
   case METRIC_TYPE_UP_DOWN:
     break;
-  case METRIC_TYPE_UP_DOWN_COUNTER_FP:
-    if (!isfinite(m->value.up_down_counter_fp)) {
+  case METRIC_TYPE_UP_DOWN_FP:
+    if (!isfinite(m->value.up_down_fp)) {
       return EAGAIN;
     }
     break;

diff --git a/src/utils/value_list/value_list.c b/src/utils/value_list/value_list.c
index 2c5760b915042d9d74ff207636033196622bcb42..86fa4ac9da0c6dc432e375754579623b0f1c039a 100644 (file)
--- a/src/utils/value_list/value_list.c
+++ b/src/utils/value_list/value_list.c
@@ -397,7 +397,7 @@ plugin_value_list_to_metric_family(value_list_t const *vl, data_set_t const *ds,
   STRBUF_DESTROY(buf);
 
   if (ds->ds[index].type == DS_TYPE_GAUGE) {
-    fam->type = METRIC_TYPE_UP_DOWN_COUNTER_FP;
+    fam->type = METRIC_TYPE_UP_DOWN_FP;
   } else {
     fam->type = METRIC_TYPE_COUNTER;
   }

diff --git a/src/write_prometheus.c b/src/write_prometheus.c
index ff6f742356f26d102de5b354d6f1e233fe3aa574..831cd660e807645c7b7cf2a195608293b725cde2 100644 (file)
--- a/src/write_prometheus.c
+++ b/src/write_prometheus.c
@@ -292,7 +292,7 @@ static void format_metric_family(strbuf_t *buf,
   switch (pfam->type) {
   case METRIC_TYPE_GAUGE:
   case METRIC_TYPE_UP_DOWN:
-  case METRIC_TYPE_UP_DOWN_COUNTER_FP:
+  case METRIC_TYPE_UP_DOWN_FP:
     type = "gauge";
     break;
   case METRIC_TYPE_COUNTER:

diff --git a/src/write_prometheus_test.c b/src/write_prometheus_test.c
index 3027a79b77339e727eaa7e84199b2b39e0502cde..67556c3f7c5829c1a311f5fdaeb02f8387f38c98 100644 (file)
--- a/src/write_prometheus_test.c
+++ b/src/write_prometheus_test.c
@@ -303,14 +303,14 @@ DEF_TEST(format_metric_family) {
                   "\n",
       },
       {
-          .name = "METRIC_TYPE_UP_DOWN_COUNTER_FP",
+          .name = "METRIC_TYPE_UP_DOWN_FP",
           .pfam =
               {
                   .name = "unit_test",
-                  .type = METRIC_TYPE_UP_DOWN_COUNTER_FP,
+                  .type = METRIC_TYPE_UP_DOWN_FP,
                   .metrics =
                       (prometheus_metric_t[]){
-                          {.value.up_down_counter_fp = 42.0},
+                          {.value.up_down_fp = 42.0},
                       },
                   .metrics_num = 1,
               },