From: Florian Forster <octo@google.com>
Date: Tue, 21 Jul 2020 17:05:55 +0000 (+0200)
Subject: format_json: migrate to metric_parse_identity().
X-Git-Tag: 6.0.0-rc0~144^2~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd9319371e4d177c1434163e2939be2fbad13f0e;p=thirdparty%2Fcollectd.git

format_json: migrate to metric_parse_identity().
---

diff --git a/src/utils/format_json/format_json_test.c b/src/utils/format_json/format_json_test.c
index b211f1a70..756a3104d 100644
--- a/src/utils/format_json/format_json_test.c
+++ b/src/utils/format_json/format_json_test.c
@@ -227,23 +227,21 @@ DEF_TEST(metric_family) {
   };
 
   for (size_t i = 0; i < sizeof(cases) / sizeof(cases[0]); i++) {
-    metric_family_t *fam;
-    CHECK_NOT_NULL(
-        fam = metric_family_unmarshal_text(cases[i].identity, cases[i].type));
-
-    metric_t *m = fam->metric.ptr;
+    metric_t *m = NULL;
+    CHECK_NOT_NULL(m = metric_parse_identity(cases[i].identity));
 
+    m->family->type = cases[i].type;
     m->value = cases[i].value;
     m->time = cases[i].time;
     m->interval = cases[i].interval;
 
     strbuf_t buf = STRBUF_CREATE;
-    CHECK_ZERO(format_json_metric_family(&buf, fam, false));
+    CHECK_ZERO(format_json_metric_family(&buf, m->family, false));
 
     EXPECT_EQ_STR(cases[i].want, buf.ptr);
     STRBUF_DESTROY(buf);
 
-    metric_family_free(fam);
+    metric_family_free(m->family);
   }
 
   return 0;