Tree wide: Rename "up_down_counter" to "up_down".

diff --git a/src/daemon/metric.c b/src/daemon/metric.c
index 81df3f46d22e0e78474828f71fcf0b6fefbd3cdb..ae38396391705f621c94234bd04329345a2f09d4 100644 (file)
--- a/src/daemon/metric.c
+++ b/src/daemon/metric.c
@@ -60,8 +60,8 @@ int value_marshal_text(strbuf_t *buf, value_t v, metric_type_t type) {
     return strbuf_printf(buf, "%" PRIu64, v.counter);
   case METRIC_TYPE_FPCOUNTER:
     return strbuf_printf(buf, GAUGE_FORMAT, v.fpcounter);
-  case METRIC_TYPE_UP_DOWN_COUNTER:
-    return strbuf_printf(buf, "%" PRId64, v.up_down_counter);
+  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)) {
       return strbuf_print(buf, "nan");

diff --git a/src/daemon/metric.h b/src/daemon/metric.h
index 99d15a2c3263cbb22bd6e000595a715eba15f5ea..fbae74fe1d99935747cbd287bfd0414ecb2f799b 100644 (file)
--- a/src/daemon/metric.h
+++ b/src/daemon/metric.h
@@ -48,10 +48,10 @@ typedef enum {
   // The rate of change is meaningful, the absolute value is not.
   METRIC_TYPE_FPCOUNTER =
       METRIC_ATTR_DOUBLE | METRIC_ATTR_CUMULATIVE | METRIC_ATTR_MONOTONIC,
-  // METRIC_TYPE_UP_DOWN_COUNTER are absolute integer metrics that can
+  // METRIC_TYPE_UP_DOWN are absolute integer metrics that can
   // (meaningfully) be summed up. Examples are filesystem space used and
   // physical memory.
-  METRIC_TYPE_UP_DOWN_COUNTER = METRIC_ATTR_CUMULATIVE,
+  METRIC_TYPE_UP_DOWN = METRIC_ATTR_CUMULATIVE,
   // METRIC_TYPE_UP_DOWN_COUNTER_FP are absolute floating point metrics that can
   // (meaningfully) be summed up.
   METRIC_TYPE_UP_DOWN_COUNTER_FP = METRIC_ATTR_DOUBLE | METRIC_ATTR_CUMULATIVE,
@@ -61,7 +61,7 @@ typedef enum {
   (t == METRIC_TYPE_GAUGE)                ? "gauge"                            \
   : (t == METRIC_TYPE_COUNTER)            ? "counter"                          \
   : (t == METRIC_TYPE_FPCOUNTER)          ? "fpcounter"                        \
-  : (t == METRIC_TYPE_UP_DOWN_COUNTER)    ? "up_down_counter"                  \
+  : (t == METRIC_TYPE_UP_DOWN)            ? "up_down"                          \
   : (t == METRIC_TYPE_UP_DOWN_COUNTER_FP) ? "up_down_counter_fp"               \
                                           : "unknown"
 
@@ -79,9 +79,9 @@ union value_u {
   gauge_t gauge;
   counter_t counter;
   fpcounter_t fpcounter;
-  up_down_counter_t up_down_counter;
+  up_down_counter_t up_down;
   up_down_counter_fp_t up_down_counter_fp;
-  // For collectd 5 compatiblity. Treated the same as up_down_counter.
+  // For collectd 5 compatiblity. Treated the same as up_down.
   derive_t derive;
 };
 typedef union value_u value_t;

diff --git a/src/daemon/utils_cache.c b/src/daemon/utils_cache.c
index 7a67d537f6aa7a9f4b40f552cedf4db91ad2abe0..f7b6410b829806ab811e898119b500b8ab492d9c 100644 (file)
--- a/src/daemon/utils_cache.c
+++ b/src/daemon/utils_cache.c
@@ -318,8 +318,8 @@ static int uc_update_rate(metric_t const *m, cache_entry_t *ce) {
     return 0;
   }
 
-  case METRIC_TYPE_UP_DOWN_COUNTER: {
-    ce->values_gauge = (gauge_t)m->value.up_down_counter;
+  case METRIC_TYPE_UP_DOWN: {
+    ce->values_gauge = (gauge_t)m->value.up_down;
     return 0;
   }
 
@@ -482,8 +482,8 @@ int uc_get_rate(metric_t const *m, gauge_t *ret) {
   case METRIC_TYPE_COUNTER:
   case METRIC_TYPE_FPCOUNTER:
     break;
-  case METRIC_TYPE_UP_DOWN_COUNTER:
-    *ret = (gauge_t)m->value.up_down_counter;
+  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;

diff --git a/src/daemon/utils_cache_test.c b/src/daemon/utils_cache_test.c
index e05729bf8f60db557fb14ebeda741933258cd1a0..64f7728c64e00a4ca5af4d0e185aa468c6709f9c 100644 (file)
--- a/src/daemon/utils_cache_test.c
+++ b/src/daemon/utils_cache_test.c
@@ -105,21 +105,21 @@ DEF_TEST(uc_get_rate) {
           .want = NAN,
       },
       {
-          .name = "up_down_counter",
-          .first_value = (value_t){.up_down_counter = 10},
-          .second_value = (value_t){.up_down_counter = 20},
+          .name = "up_down",
+          .first_value = (value_t){.up_down = 10},
+          .second_value = (value_t){.up_down = 20},
           .first_time = TIME_T_TO_CDTIME_T(100),
           .second_time = TIME_T_TO_CDTIME_T(110),
-          .type = METRIC_TYPE_UP_DOWN_COUNTER,
+          .type = METRIC_TYPE_UP_DOWN,
           .want = 20,
       },
       {
-          .name = "decreasing up_down_counter",
-          .first_value = (value_t){.up_down_counter = 1000},
-          .second_value = (value_t){.up_down_counter = 215},
+          .name = "decreasing up_down",
+          .first_value = (value_t){.up_down = 1000},
+          .second_value = (value_t){.up_down = 215},
           .first_time = TIME_T_TO_CDTIME_T(100),
           .second_time = TIME_T_TO_CDTIME_T(110),
-          .type = METRIC_TYPE_UP_DOWN_COUNTER,
+          .type = METRIC_TYPE_UP_DOWN,
           .want = 215,
       },
       {
@@ -169,8 +169,8 @@ DEF_TEST(uc_get_rate) {
     gauge_t want = cases[i].first_value.gauge;
     if (IS_MONOTONIC(fam.type)) {
       want = NAN;
-    } else if (fam.type == METRIC_TYPE_UP_DOWN_COUNTER) {
-      want = (gauge_t)cases[i].first_value.up_down_counter;
+    } else if (fam.type == METRIC_TYPE_UP_DOWN) {
+      want = (gauge_t)cases[i].first_value.up_down;
     }
     EXPECT_EQ_DOUBLE(want, got);
 

diff --git a/src/df.c b/src/df.c
index f4b552e57d8b9e61eacc15bbe819d4394caa3e51..59d11350b1ea447964e3b3fb87c4ae7b5c4778f7 100644 (file)
--- a/src/df.c
+++ b/src/df.c
@@ -161,7 +161,7 @@ static int df_read(void) {
   metric_family_t fam_usage = {
       .name = "system.filesystem.usage",
       .unit = "By",
-      .type = METRIC_TYPE_UP_DOWN_COUNTER,
+      .type = METRIC_TYPE_UP_DOWN,
   };
   metric_family_t fam_utilization = {
       .name = "system.filesystem.utilization",
@@ -171,7 +171,7 @@ static int df_read(void) {
   metric_family_t fam_inode_usage = {
       .name = "system.filesystem.inodes.usage",
       .unit = "{inode}",
-      .type = METRIC_TYPE_UP_DOWN_COUNTER,
+      .type = METRIC_TYPE_UP_DOWN,
   };
   metric_family_t fam_inode_utilization = {
       .name = "system.filesystem.inodes.utilization",
@@ -254,16 +254,13 @@ static int df_read(void) {
 
     if (report_usage) {
       metric_family_append(&fam_usage, state_label, state_used,
-                           (value_t){.up_down_counter = blk_used * blocksize},
-                           &m);
+                           (value_t){.up_down = blk_used * blocksize}, &m);
 
       metric_family_append(&fam_usage, state_label, state_free,
-                           (value_t){.up_down_counter = blk_free * blocksize},
-                           &m);
+                           (value_t){.up_down = blk_free * blocksize}, &m);
 
-      metric_family_append(
-          &fam_usage, state_label, state_reserved,
-          (value_t){.up_down_counter = blk_reserved * blocksize}, &m);
+      metric_family_append(&fam_usage, state_label, state_reserved,
+                           (value_t){.up_down = blk_reserved * blocksize}, &m);
     }
 
     if (report_utilization) {
@@ -315,13 +312,13 @@ static int df_read(void) {
       }
       if (report_usage) {
         metric_family_append(&fam_inode_usage, state_label, state_used,
-                             (value_t){.up_down_counter = inode_used}, &m);
+                             (value_t){.up_down = inode_used}, &m);
 
         metric_family_append(&fam_inode_usage, state_label, state_free,
-                             (value_t){.up_down_counter = inode_free}, &m);
+                             (value_t){.up_down = inode_free}, &m);
 
         metric_family_append(&fam_inode_usage, state_label, state_reserved,
-                             (value_t){.up_down_counter = inode_reserved}, &m);
+                             (value_t){.up_down = inode_reserved}, &m);
       }
     }
 

diff --git a/src/memory.c b/src/memory.c
index 9328232dceeb2abfc2e274d166ec11ee40c85d99..6f72ea087b48aae52f9e910d619ffde49315e467 100644 (file)
--- a/src/memory.c
+++ b/src/memory.c
@@ -175,7 +175,7 @@ static int memory_dispatch(up_down_counter_t values[STATE_MAX]) {
       .name = "system.memory.usage",
       .help = "Reports memory in use by state",
       .unit = "By",
-      .type = METRIC_TYPE_UP_DOWN_COUNTER,
+      .type = METRIC_TYPE_UP_DOWN,
   };
   up_down_counter_t total = 0;
 
@@ -212,10 +212,10 @@ static int memory_dispatch(up_down_counter_t values[STATE_MAX]) {
         .name = "system.memory.limit",
         .help = "Total memory available in the system.",
         .unit = "By",
-        .type = METRIC_TYPE_UP_DOWN_COUNTER,
+        .type = METRIC_TYPE_UP_DOWN,
     };
     metric_family_metric_append(&fam_limit, (metric_t){
-                                                .value.up_down_counter = total,
+                                                .value.up_down = total,
                                             });
 
     int status = plugin_dispatch_metric_family(&fam_limit);

diff --git a/src/utils/cmds/putmetric.c b/src/utils/cmds/putmetric.c
index 39adc59338e59651069b8db3a5d5c646f3a50558..3e93854af8a66d85889f78015e77676139f697f4 100644 (file)
--- a/src/utils/cmds/putmetric.c
+++ b/src/utils/cmds/putmetric.c
@@ -49,7 +49,7 @@ static int set_option(metric_t *m, char const *key, char const *value,
     } else if (strcasecmp("FPCOUNTER", value) == 0) {
       m->family->type = METRIC_TYPE_FPCOUNTER;
     } else if (strcasecmp("UP_DOWN_COUNTER", value) == 0) {
-      m->family->type = METRIC_TYPE_UP_DOWN_COUNTER;
+      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;
     } else {
@@ -257,7 +257,7 @@ int cmd_format_putmetric(strbuf_t *buf, metric_t const *m) { /* {{{ */
   case METRIC_TYPE_GAUGE:
     strbuf_print(buf, " type=GAUGE");
     break;
-  case METRIC_TYPE_UP_DOWN_COUNTER:
+  case METRIC_TYPE_UP_DOWN:
     strbuf_print(buf, " type=UP_DOWN_COUNTER");
     break;
   case METRIC_TYPE_UP_DOWN_COUNTER_FP:

diff --git a/src/utils/common/common.c b/src/utils/common/common.c
index 61894e052ff2f90bb1be0918beceb6e1f159c0c8..d503d9e779b5ac5e976e789d778a88df84889a6b 100644 (file)
--- a/src/utils/common/common.c
+++ b/src/utils/common/common.c
@@ -968,8 +968,8 @@ int parse_value(char const *value, value_t *ret_value, metric_type_t type) {
     ret_value->fpcounter = (fpcounter_t)strtod(value, &endptr);
     break;
 
-  case METRIC_TYPE_UP_DOWN_COUNTER:
-    ret_value->up_down_counter = (up_down_counter_t)strtoll(value, &endptr, 0);
+  case METRIC_TYPE_UP_DOWN:
+    ret_value->up_down = (up_down_counter_t)strtoll(value, &endptr, 0);
     break;
 
   case METRIC_TYPE_UP_DOWN_COUNTER_FP:
@@ -1239,9 +1239,9 @@ int rate_to_value(value_t *ret_value, gauge_t rate, /* {{{ */
       state->last_value.fpcounter = (fpcounter_t)rate;
       state->residual = 0;
       break;
-    case METRIC_TYPE_UP_DOWN_COUNTER:
-      state->last_value.up_down_counter = (up_down_counter_t)floor(rate);
-      state->residual = rate - ((gauge_t)state->last_value.up_down_counter);
+    case METRIC_TYPE_UP_DOWN:
+      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;
@@ -1272,9 +1272,9 @@ int rate_to_value(value_t *ret_value, gauge_t rate, /* {{{ */
     state->residual = 0;
     break;
   }
-  case METRIC_TYPE_UP_DOWN_COUNTER: {
+  case METRIC_TYPE_UP_DOWN: {
     up_down_counter_t delta = (up_down_counter_t)floor(delta_gauge);
-    state->last_value.up_down_counter += delta;
+    state->last_value.up_down += delta;
     state->residual = delta_gauge - ((gauge_t)delta);
     break;
   }
@@ -1314,9 +1314,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: {
-    up_down_counter_t diff =
-        value.up_down_counter - state->last_value.up_down_counter;
+  case METRIC_TYPE_UP_DOWN: {
+    up_down_counter_t diff = value.up_down - state->last_value.up_down;
     *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 42268771f98626a071f01e133704b94bbef04205..54b46b2d690330949c2f018a8b8662bf1d895931 100644 (file)
--- a/src/utils/common/common_test.c
+++ b/src/utils/common/common_test.c
@@ -448,10 +448,9 @@ DEF_TEST(rate_to_value) {
       EXPECT_EQ_DOUBLE(cases[i].want.fpcounter, got.fpcounter);
       EXPECT_EQ_UINT64(cases[i].want.fpcounter, state.last_value.fpcounter);
       break;
-    case METRIC_TYPE_UP_DOWN_COUNTER:
-      EXPECT_EQ_UINT64(cases[i].want.up_down_counter, got.up_down_counter);
-      EXPECT_EQ_UINT64(cases[i].want.up_down_counter,
-                       state.last_value.up_down_counter);
+    case METRIC_TYPE_UP_DOWN:
+      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,

diff --git a/src/utils/format_json/format_json.c b/src/utils/format_json/format_json.c
index 3fe237accdcee12f7f76343916e74c6f885b2e3f..c7cefae0bf6b22d57b65e1dbf1846a8d73c41dc7 100644 (file)
--- a/src/utils/format_json/format_json.c
+++ b/src/utils/format_json/format_json.c
@@ -165,7 +165,7 @@ static char const *metric_type_to_string(metric_type_t type) {
     return "COUNTER";
   case METRIC_TYPE_FPCOUNTER:
     return "FPCOUNTER";
-  case METRIC_TYPE_UP_DOWN_COUNTER:
+  case METRIC_TYPE_UP_DOWN:
     return "UP_DOWN_COUNTER";
   case METRIC_TYPE_UP_DOWN_COUNTER_FP:
     return "UP_DOWN_COUNTER_FP";

diff --git a/src/utils/format_json/open_telemetry.c b/src/utils/format_json/open_telemetry.c
index e5e9ec5c5b08027a5a06e5831831dacfae3c5926..c463dab75fb2dc3f81747da37cb2eff8dfc518f1 100644 (file)
--- a/src/utils/format_json/open_telemetry.c
+++ b/src/utils/format_json/open_telemetry.c
@@ -104,9 +104,9 @@ static int number_data_point(yajl_gen g, metric_t const *m) {
     CHECK(json_add_string(g, "asDouble"));
     CHECK(yajl_gen_double(g, m->value.fpcounter));
     break;
-  case METRIC_TYPE_UP_DOWN_COUNTER:
+  case METRIC_TYPE_UP_DOWN:
     CHECK(json_add_string(g, "asInt"));
-    CHECK(yajl_gen_integer(g, (long long int)m->value.up_down_counter));
+    CHECK(yajl_gen_integer(g, (long long int)m->value.up_down));
     break;
   case METRIC_TYPE_UP_DOWN_COUNTER_FP:
     CHECK(json_add_string(g, "asDouble"));
@@ -180,7 +180,7 @@ static int metric(yajl_gen g, metric_family_t const *fam) {
     break;
   case METRIC_TYPE_COUNTER:
   case METRIC_TYPE_FPCOUNTER:
-  case METRIC_TYPE_UP_DOWN_COUNTER:
+  case METRIC_TYPE_UP_DOWN:
   case METRIC_TYPE_UP_DOWN_COUNTER_FP:
     CHECK(json_add_string(g, "sum"));
     CHECK(sum(g, fam));

diff --git a/src/utils/format_kairosdb/format_kairosdb.c b/src/utils/format_kairosdb/format_kairosdb.c
index a3c334e76b7ac2f39d89b2ab7e8cf25c2a92cec2..b0d636bbf20c888a2fe6cbd479d081ecd9dbb1b7 100644 (file)
--- a/src/utils/format_kairosdb/format_kairosdb.c
+++ b/src/utils/format_kairosdb/format_kairosdb.c
@@ -120,8 +120,8 @@ static int json_add_value(yajl_gen g, metric_t const *m,
   case METRIC_TYPE_FPCOUNTER:
     CHECK(yajl_gen_double(g, m->value.fpcounter));
     return 0;
-  case METRIC_TYPE_UP_DOWN_COUNTER:
-    CHECK(yajl_gen_integer(g, (long long int)m->value.up_down_counter));
+  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));

diff --git a/src/utils/format_open_telemetry/format_open_telemetry.cc b/src/utils/format_open_telemetry/format_open_telemetry.cc
index 8cdb4a47027ebdf4e8a4461a97c66087bd30b57f..d5c563a30e83b45ee1eb97f43d9f3ff4e9c7a2d6 100644 (file)
--- a/src/utils/format_open_telemetry/format_open_telemetry.cc
+++ b/src/utils/format_open_telemetry/format_open_telemetry.cc
@@ -73,8 +73,8 @@ static void metric_to_number_data_point(NumberDataPoint *dp,
   case METRIC_TYPE_COUNTER:
     dp->set_as_int((int64_t)m->value.counter);
     return;
-  case METRIC_TYPE_UP_DOWN_COUNTER:
-    dp->set_as_int((int64_t)m->value.up_down_counter);
+  case METRIC_TYPE_UP_DOWN:
+    dp->set_as_int((int64_t)m->value.up_down);
     return;
   case METRIC_TYPE_FPCOUNTER:
     dp->set_as_double(m->value.fpcounter);
@@ -138,7 +138,7 @@ static void add_metric(ScopeMetrics *sm, metric_family_t const *fam) {
     return;
   case METRIC_TYPE_COUNTER:
   case METRIC_TYPE_FPCOUNTER:
-  case METRIC_TYPE_UP_DOWN_COUNTER:
+  case METRIC_TYPE_UP_DOWN:
   case METRIC_TYPE_UP_DOWN_COUNTER_FP:
     set_sum(m, fam);
     return;

diff --git a/src/utils/format_stackdriver/format_stackdriver.c b/src/utils/format_stackdriver/format_stackdriver.c
index 2e22328bf6f6d85af126f348d0e5c384f40e111a..242dd172b782243ea7eca2cf204ea6cafa3fd444 100644 (file)
--- a/src/utils/format_stackdriver/format_stackdriver.c
+++ b/src/utils/format_stackdriver/format_stackdriver.c
@@ -166,9 +166,9 @@ static int format_typed_value(yajl_gen gen, metric_t const *m,
     }
     break;
   }
-  case METRIC_TYPE_UP_DOWN_COUNTER: {
+  case METRIC_TYPE_UP_DOWN: {
     char integer[64] = {0};
-    ssnprintf(integer, sizeof(integer), "%" PRId64, m->value.up_down_counter);
+    ssnprintf(integer, sizeof(integer), "%" PRId64, m->value.up_down);
 
     int status = json_string(gen, "int64Value") || json_string(gen, integer);
     if (status != 0) {
@@ -203,7 +203,7 @@ static int format_typed_value(yajl_gen gen, metric_t const *m,
 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_COUNTER:
+  case METRIC_TYPE_UP_DOWN:
   case METRIC_TYPE_UP_DOWN_COUNTER_FP:
     return json_string(gen, "GAUGE");
   case METRIC_TYPE_COUNTER:
@@ -229,7 +229,7 @@ static int format_value_type(yajl_gen gen, metric_t const *m) {
   case METRIC_TYPE_FPCOUNTER:
   case METRIC_TYPE_UP_DOWN_COUNTER_FP:
     return json_string(gen, "DOUBLE");
-  case METRIC_TYPE_UP_DOWN_COUNTER:
+  case METRIC_TYPE_UP_DOWN:
   case METRIC_TYPE_COUNTER:
     return json_string(gen, "INT64");
   case METRIC_TYPE_UNTYPED:
@@ -413,7 +413,7 @@ static int format_time_series(yajl_gen gen, metric_t const *m,
       return EAGAIN;
     }
     break;
-  case METRIC_TYPE_UP_DOWN_COUNTER:
+  case METRIC_TYPE_UP_DOWN:
     break;
   case METRIC_TYPE_UP_DOWN_COUNTER_FP:
     if (!isfinite(m->value.up_down_counter_fp)) {

diff --git a/src/utils/value_list/value_list.h b/src/utils/value_list/value_list.h
index 68454bbd24bec09f4abadfa891421d22068a96e1..12b98ef4f9113e4737864f9b70b1da80a74a4f41 100644 (file)
--- a/src/utils/value_list/value_list.h
+++ b/src/utils/value_list/value_list.h
@@ -34,7 +34,7 @@
 
 #define DS_TYPE_COUNTER METRIC_TYPE_COUNTER
 #define DS_TYPE_GAUGE METRIC_TYPE_GAUGE
-#define DS_TYPE_DERIVE METRIC_TYPE_UP_DOWN_COUNTER
+#define DS_TYPE_DERIVE METRIC_TYPE_UP_DOWN
 
 #define DS_TYPE_TO_STRING(t)                                                   \
   (t == DS_TYPE_COUNTER)  ? "counter"                                          \

diff --git a/src/write_prometheus.c b/src/write_prometheus.c
index 231ee3ebe162f09b908f71ae0907b0b082a2e61c..ff6f742356f26d102de5b354d6f1e233fe3aa574 100644 (file)
--- a/src/write_prometheus.c
+++ b/src/write_prometheus.c
@@ -291,7 +291,7 @@ static void format_metric_family(strbuf_t *buf,
   char *type = NULL;
   switch (pfam->type) {
   case METRIC_TYPE_GAUGE:
-  case METRIC_TYPE_UP_DOWN_COUNTER:
+  case METRIC_TYPE_UP_DOWN:
   case METRIC_TYPE_UP_DOWN_COUNTER_FP:
     type = "gauge";
     break;

diff --git a/src/write_prometheus_test.c b/src/write_prometheus_test.c
index 86cd8aebcdcc76256274fec816dd38b0c533bf14..3027a79b77339e727eaa7e84199b2b39e0502cde 100644 (file)
--- a/src/write_prometheus_test.c
+++ b/src/write_prometheus_test.c
@@ -286,14 +286,14 @@ DEF_TEST(format_metric_family) {
                   "\n",
       },
       {
-          .name = "METRIC_TYPE_UP_DOWN_COUNTER",
+          .name = "METRIC_TYPE_UP_DOWN",
           .pfam =
               {
                   .name = "unit_test",
-                  .type = METRIC_TYPE_UP_DOWN_COUNTER,
+                  .type = METRIC_TYPE_UP_DOWN,
                   .metrics =
                       (prometheus_metric_t[]){
-                          {.value.up_down_counter = 42},
+                          {.value.up_down = 42},
                       },
                   .metrics_num = 1,
               },