lib: cmetrics: upgrade to v2.1.2

Signed-off-by: Eduardo Silva <eduardo@chronosphere.io>

Author: edsiper

lib/cmetrics/CMakeLists.txt

@@ -6,7 +6,7 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 # CMetrics Version
 set(CMT_VERSION_MAJOR  2)
 set(CMT_VERSION_MINOR  1)
-set(CMT_VERSION_PATCH  1)
+set(CMT_VERSION_PATCH  2)
 set(CMT_VERSION_STR "${CMT_VERSION_MAJOR}.${CMT_VERSION_MINOR}.${CMT_VERSION_PATCH}")
 
 # Include helpers

lib/cmetrics/src/cmt_decode_prometheus.c

@@ -441,8 +441,10 @@ static int add_metric_histogram(struct cmt_decode_prometheus_context *context)
 {
     int ret = 0;
     int i;
+    int has_le = CMT_FALSE;
     size_t bucket_count;
     size_t bucket_index;
+    size_t label_count = 0;
     double *buckets = NULL;
     uint64_t *bucket_defaults = NULL;
     double sum = 0;
@@ -488,14 +490,30 @@ static int add_metric_histogram(struct cmt_decode_prometheus_context *context)
                 "failed to allocate buckets");
         goto end;
     }
-    labels_without_le = calloc(context->metric.label_count - 1, sizeof(*labels_without_le));
+    for (i = 0; i < context->metric.label_count; i++) {
+        if (!strcmp(context->metric.labels[i], "le")) {
+            has_le = CMT_TRUE;
+        }
+        else {
+            label_count++;
+        }
+    }
+
+    if (!has_le) {
+        ret = report_error(context,
+                CMT_DECODE_PROMETHEUS_SYNTAX_ERROR,
+                "missing histogram bucket \"le\" label");
+        goto end;
+    }
+
+    labels_without_le = calloc(label_count, sizeof(*labels_without_le));
     if (!labels_without_le) {
         ret = report_error(context,
                 CMT_DECODE_PROMETHEUS_CMT_CREATE_ERROR,
                 "failed to allocate labels_without_le");
         goto end;
     }
-    values_without_le = calloc(context->metric.label_count - 1, sizeof(*labels_without_le));
+    values_without_le = calloc(label_count, sizeof(*values_without_le));
     if (!values_without_le) {
         ret = report_error(context,
                 CMT_DECODE_PROMETHEUS_CMT_CREATE_ERROR,
@@ -525,6 +543,13 @@ static int add_metric_histogram(struct cmt_decode_prometheus_context *context)
                     /* probably last bucket, which has "Inf" */
                     break;
                 }
+                if (!sample->label_values[le_label_index] ||
+                    sample->label_values[le_label_index][0] == '\0') {
+                    ret = report_error(context,
+                            CMT_DECODE_PROMETHEUS_SYNTAX_ERROR,
+                            "missing histogram bucket \"le\" value");
+                    goto end;
+                }
                 if (parse_double(sample->label_values[le_label_index],
                             buckets + bucket_index)) {
                     ret = report_error(context,

lib/cmetrics/tests/prometheus_parser.c

@@ -692,6 +692,26 @@ void test_histogram_labels()
     cmt_decode_prometheus_destroy(cmt);
 }
 
+void test_histogram_missing_le_label()
+{
+    int status;
+    struct cmt *cmt;
+    struct cmt_decode_prometheus_parse_opts opts;
+
+    cmt = NULL;
+    memset(&opts, 0, sizeof(opts));
+
+    status = cmt_decode_prometheus_create(&cmt,
+            "# HELP test_histogram A histogram missing the le label.\n"
+            "# TYPE test_histogram histogram\n"
+            "test_histogram_bucket{foo=\"bar\"} 1\n"
+            "test_histogram_bucket{foo=\"baz\"} 2\n"
+            "test_histogram_sum 3.5\n"
+            "test_histogram_count 2\n", 0, &opts);
+
+    TEST_CHECK(status == CMT_DECODE_PROMETHEUS_SYNTAX_ERROR);
+}
+
 void test_summary()
 {
     int status;
@@ -1712,6 +1732,7 @@ TEST_LIST = {
     {"issue_71", test_issue_71},
     {"histogram", test_histogram},
     {"histogram_labels", test_histogram_labels},
+    {"histogram_missing_le_label", test_histogram_missing_le_label},
     {"summary", test_summary},
     {"null_labels", test_null_labels},
     {"issue_fluent_bit_5541", test_issue_fluent_bit_5541},