lib: cmetrics: upgrade to v1.0.3

Signed-off-by: Eduardo Silva <[email protected]>

Author: edsiper

lib/cmetrics/CMakeLists.txt

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

lib/cmetrics/src/cmt_decode_prometheus.c

@@ -444,7 +444,7 @@ static int add_metric_histogram(struct cmt_decode_prometheus_context *context)
     size_t bucket_index;
     double *buckets = NULL;
     uint64_t *bucket_defaults = NULL;
-    double sum;
+    double sum = 0;
     uint64_t count = 0;
     double count_dbl;
     struct cfl_list *head;
@@ -1177,7 +1177,7 @@ static int parse_sample(struct cmt_decode_prometheus_context *context,
                 "sample value is too long (max %zu characters)", sizeof(sample->value1) - 1);
     }
 
-    strncpy(sample->value1, value1, len);
+    memcpy(sample->value1, value1, len);
     sample->value1[len] = 0;
 
     /* value2 */
@@ -1187,7 +1187,7 @@ static int parse_sample(struct cmt_decode_prometheus_context *context,
                 CMT_DECODE_PROMETHEUS_SAMPLE_VALUE_TOO_LONG,
                 "sample value is too long (max %zu characters)", sizeof(sample->value2) - 1);
     }
-    strncpy(sample->value2, value2, len);
+    memcpy(sample->value2, value2, len);
     sample->value2[len] = 0;
 
     return 0;

lib/cmetrics/src/cmt_decode_prometheus.l

@@ -45,7 +45,7 @@
 ^[ ]*#[ ]* {
     // Lines with "#" as the first non-whitespace character begin a comment
     // unless the first token is either HELP or TYPE. To handle this ambiguity,
-    // we enter the COMMENT_START state, which contains rules for selecting 
+    // we enter the COMMENT_START state, which contains rules for selecting
     // if this is a HELP/TYPE tag or just a normal comment
     BEGIN(COMMENT_START);
 }
@@ -86,7 +86,7 @@
         // separate start condition for this to handle "\\" and "\n" escapes
         // more easily.
         BEGIN(INHELPTAG);
-        context->strbuf = sds_alloc(256);
+        context->strbuf = cfl_sds_create_size(256);
     }
     else {
         // For TYPETAG we enter INTYPETAG start condition to check only valid
@@ -149,7 +149,7 @@
     if (context->strbuf != NULL) {
         cfl_sds_destroy(context->strbuf);
     }
-    context->strbuf = sds_alloc(256);
+    context->strbuf = cfl_sds_create_size(256);
 }
 
 <INQUOTE>[\\]["] {

lib/cmetrics/src/cmt_encode_prometheus_remote_write.c

@@ -1037,14 +1037,28 @@ int pack_complex_type(struct cmt_prometheus_remote_write_context *context,
     add_metadata = CMT_ENCODE_PROMETHEUS_REMOTE_WRITE_ADD_METADATA;
     result = CMT_ENCODE_PROMETHEUS_REMOTE_WRITE_SUCCESS;
 
-    if (map->type == CMT_SUMMARY) {
-        additional_label.name = (cfl_sds_t) "quantile";
-    }
-    else if (map->type == CMT_HISTOGRAM) {
-        additional_label.name = (cfl_sds_t) "le";
-    }
+    if (map->type == CMT_SUMMARY || map->type == CMT_HISTOGRAM) {
+        if (map->type == CMT_SUMMARY) {
+            additional_label.name = (cfl_sds_t) "quantile";
+        }
+        else if (map->type == CMT_HISTOGRAM) {
+            additional_label.name = (cfl_sds_t) "le";
+        }
+
+        /*
+         * Suppress GCC/Clang warning for storing the address of a stack-allocated label in a list. We are
+         * safe here because the label is removed before function exit.
+         *
+         * This avoids a -Wdangling-pointer false positive.
+         */
+        #pragma GCC diagnostic push
+        #pragma GCC diagnostic ignored "-Wdangling-pointer"
+
 
-    cfl_list_add(&additional_label._head, &map->label_keys);
+        cfl_list_add(&additional_label._head, &map->label_keys);
+
+        #pragma GCC diagnostic pop
+    }
 
     if (map->metric_static_set == CMT_TRUE) {
         result = pack_complex_metric_sample(context, map, &map->metric, add_metadata);
@@ -1064,8 +1078,7 @@ int pack_complex_type(struct cmt_prometheus_remote_write_context *context,
         }
     }
 
-    if (map->type == CMT_SUMMARY ||
-        map->type == CMT_HISTOGRAM) {
+    if (map->type == CMT_SUMMARY || map->type == CMT_HISTOGRAM) {
         cfl_list_del(&additional_label._head);
     }
 

lib/cmetrics/src/cmt_filter.c

@@ -348,7 +348,7 @@ static int filter_context_label_key_value(struct cmt *dst, struct cmt *src,
             return -1;
         }
 
-        map = cmt_map_create(CMT_UNTYPED, &gauge->opts,
+        map = cmt_map_create(CMT_UNTYPED, &untyped->opts,
                              untyped->map->label_count,
                              labels, (void *) untyped);
         free(labels);