format_graphite: Fix unit test.

diff --git a/Makefile.am b/Makefile.am
index f392baa27f98c0d6336caae0b4cc4c558e37215b..e55b03223b99fbe29d3302ebc2424e17b131d0ca 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -487,6 +487,7 @@ test_format_graphite_LDADD = \
        libformat_graphite.la \
        libidentity.la \
        libmetadata.la \
+       libmetric.la \
        libplugin_mock.la \
        libstrbuf.la \
        -lm

diff --git a/src/utils/format_graphite/format_graphite_test.c b/src/utils/format_graphite/format_graphite_test.c
index c3a92143b735d2b51a3008eaf767ce4dfb2edc6f..8452700aa05ce1ce333cefb7a18fa9702bb8802f 100644 (file)
--- a/src/utils/format_graphite/format_graphite_test.c
+++ b/src/utils/format_graphite/format_graphite_test.c
@@ -32,19 +32,19 @@
 
 DEF_TEST(metric_name) {
   struct {
-    char const *name;
+    char *name;
     size_t labels_num;
     char const **keys;
     char const **values;
     value_t value;
-    int value_type;
+    metric_type_t type;
     unsigned int flags;
     const char *want;
   } cases[] = {
       {
           .name = "unit_test",
           .value = (value_t){.gauge = 42},
-          .value_type = DS_TYPE_GAUGE,
+          .type = METRIC_TYPE_GAUGE,
           .want = "unit_test 42",
       },
       {
@@ -52,26 +52,25 @@ DEF_TEST(metric_name) {
           .labels_num = 2,
           .keys = (char const *[]){"beta", "alpha"},
           .values = (char const *[]){"second", "first"},
-          .value = (value_t){.derive = -9223372036854775807LL},
-          .value_type = DS_TYPE_DERIVE,
+          .value = (value_t){.counter = 0},
+          .type = METRIC_TYPE_COUNTER,
           .want =
-              "test_with_label.alpha=first.beta=second -9223372036854775807",
+              "test_with_label.alpha=first.beta=second 0",
       },
       {
           .name = "separate_instances_test",
           .labels_num = 2,
           .keys = (char const *[]){"beta", "alpha"},
           .values = (char const *[]){"second", "first"},
-          .value = (value_t){.derive = 9223372036854775807LL},
-          .value_type = DS_TYPE_DERIVE,
+          .value = (value_t){.counter = 0},
+          .type = METRIC_TYPE_COUNTER,
           .flags = GRAPHITE_SEPARATE_INSTANCES,
-          .want = "separate_instances_test.alpha.first.beta.second "
-                  "9223372036854775807",
+          .want = "separate_instances_test.alpha.first.beta.second 0",
       },
       {
           .name = "escaped:metric_name",
           .value = (value_t){.gauge = NAN},
-          .value_type = DS_TYPE_GAUGE,
+          .type = METRIC_TYPE_GAUGE,
           .want = "escaped_metric_name nan",
       },
       {
@@ -80,25 +79,26 @@ DEF_TEST(metric_name) {
           .keys = (char const *[]){"beta", "alpha"},
           .values = (char const *[]){"second value", "first/value"},
           .value = (value_t){.counter = 18446744073709551615LLU},
-          .value_type = DS_TYPE_COUNTER,
+          .type = DS_TYPE_COUNTER,
           .want = "escaped_label_value.alpha=first_value.beta=second_value "
                   "18446744073709551615",
       },
   };
 
   for (size_t i = 0; i < STATIC_ARRAY_SIZE(cases); i++) {
-    identity_t *id;
-    CHECK_NOT_NULL(id = identity_create(cases[i].name));
-    for (size_t j = 0; j < cases[i].labels_num; j++) {
-      CHECK_ZERO(identity_add_label(id, cases[i].keys[j], cases[i].values[j]));
-    }
+    metric_family_t fam = {
+        .name = cases[i].name,
+        .type = cases[i].type,
+    };
 
-    metric_single_t m = {
-        .identity = id,
+    metric_t m = {
+        .family = &fam,
         .value = cases[i].value,
-        .value_type = cases[i].value_type,
         .time = 1710200311404036096, /* 1592748157.125 */
     };
+    for (size_t j = 0; j < cases[i].labels_num; j++) {
+      CHECK_ZERO(metric_label_set(&m, cases[i].keys[j], cases[i].values[j]));
+    }
 
     strbuf_t buf = STRBUF_CREATE;
     EXPECT_EQ_INT(0, format_graphite(&buf, &m, "", "", '_', cases[i].flags));
@@ -106,13 +106,13 @@ DEF_TEST(metric_name) {
     strbuf_t want = STRBUF_CREATE;
     if (cases[i].want != NULL) {
       strbuf_print(&want, cases[i].want);
-      strbuf_print(&want, " 1480063672\r\n");
+      strbuf_print(&want, " 1592748157\r\n");
     }
     EXPECT_EQ_STR(want.ptr, buf.ptr);
 
     STRBUF_DESTROY(want);
     STRBUF_DESTROY(buf);
-    identity_destroy(id);
+    metric_reset(&m);
   }
 
   return 0;