lib: cmetrics: upgrade from v0.3.5 to v0.3.6

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

Author: edsiper

lib/cmetrics/.github/actionlint-matcher.json

@@ -0,0 +1,17 @@
+{
+    "problemMatcher": [
+      {
+        "owner": "actionlint",
+        "pattern": [
+          {
+            "regexp": "^(?:\\x1b\\[\\d+m)?(.+?)(?:\\x1b\\[\\d+m)*:(?:\\x1b\\[\\d+m)*(\\d+)(?:\\x1b\\[\\d+m)*:(?:\\x1b\\[\\d+m)*(\\d+)(?:\\x1b\\[\\d+m)*: (?:\\x1b\\[\\d+m)*(.+?)(?:\\x1b\\[\\d+m)* \\[(.+?)\\]$",
+            "file": 1,
+            "line": 2,
+            "column": 3,
+            "message": 4,
+            "code": 5
+          }
+        ]
+      }
+    ]
+  }

lib/cmetrics/.github/workflows/build.yaml

@@ -1,5 +1,6 @@
 name: Build PR(s) and master branch.
 on:
+  workflow_dispatch:
   push:
     branches:
       - master
@@ -15,6 +16,8 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-latest, windows-2019]
+    permissions:
+      contents: read
     steps:
       - uses: actions/checkout@v3
       - name: Build on ${{ matrix.os }} with vs-2019
@@ -28,14 +31,13 @@ jobs:
     name: CentOS 7 build to confirm no issues once used downstream
     runs-on: ubuntu-latest
     container: centos:7
+    permissions:
+      contents: read
     steps:
       - name: Set up base image dependencies
         run: |
           yum -y update && \
-          yum install -y rpm-build curl ca-certificates gcc gcc-c++ cmake make bash \
-                        wget unzip systemd-devel wget flex bison \
-                        cyrus-sasl-lib cyrus-sasl-devel openssl openss-libs openssl-devel \
-                        postgresql-libs postgresql-devel postgresql-server postgresql && \
+          yum install -y rpm-build curl ca-certificates gcc gcc-c++ cmake make wget && \
           wget http://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm && \
           rpm -ivh epel-release-latest-7.noarch.rpm && \
           yum install -y cmake3
@@ -55,6 +57,8 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         compiler: [ gcc, clang ]
+    permissions:
+      contents: read
     steps:
       - uses: actions/checkout@v3
       - name: Build on ${{ matrix.os }} with ${{ matrix.compiler }}
@@ -75,6 +79,7 @@ jobs:
             CTEST_OUTPUT_ON_FAILURE=1 make test
         env:
           CC: ${{ matrix.compiler }}
+
   build-unix-amd64:
     name: Build sources on amd64 for ${{ matrix.os }} - ${{ matrix.compiler }}
     runs-on: ${{ matrix.os }}
@@ -83,6 +88,8 @@ jobs:
       matrix:
         os: [ubuntu-latest, macos-latest]
         compiler: [ gcc, clang ]
+    permissions:
+      contents: read
     steps:
       - uses: actions/checkout@v3
       - name: Build on ${{ matrix.os }} with ${{ matrix.compiler }}
@@ -93,3 +100,27 @@ jobs:
           CTEST_OUTPUT_ON_FAILURE=1 make test
         env:
           CC: ${{ matrix.compiler }}
+
+  build-analysis-tests:
+    name: Build with various code analysis tools
+    strategy:
+      fail-fast: false
+      matrix:
+        preset:
+          - clang-sanitize-address
+          - clang-sanitize-memory
+          - clang-sanitize-undefined
+          - clang-sanitize-dataflow
+          - clang-sanitize-safe-stack
+          - valgrind
+    permissions:
+      contents: read
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: docker://lpenz/ghaction-cmake:0.19
+        with:
+          preset: ${{ matrix.preset }}
+          # dependencies_debian: ''
+          cmakeflags: '-DCMT_TESTS=On -DCMT_DEV=on .'
+          build_command: make all

lib/cmetrics/.github/workflows/lint.yaml

@@ -0,0 +1,28 @@
+name: Lint PRs
+on:
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  shellcheck:
+    runs-on: ubuntu-latest
+    name: Shellcheck
+    permissions:
+      contents: read
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ludeeus/action-shellcheck@master
+
+  actionlint:
+    runs-on: ubuntu-latest
+    name: Actionlint
+    permissions:
+      contents: read
+    steps:
+      - uses: actions/checkout@v3
+      - run: |
+          echo "::add-matcher::.github/actionlint-matcher.json"
+          bash <(curl https://raw.githubusercontent.com/rhysd/actionlint/main/scripts/download-actionlint.bash)
+          ./actionlint -color -shellcheck=
+        shell: bash
+

lib/cmetrics/.gitignore

@@ -2,3 +2,6 @@
 build/*
 include/cmetrics/cmt_info.h
 include/cmetrics/cmt_version.h
+LICENSE.txt
+README.html
+welcome.txt

lib/cmetrics/.mdlrc

@@ -0,0 +1 @@
+style "#{File.dirname(__FILE__)}/markdownlint.rb"

lib/cmetrics/CMakeLists.txt

@@ -31,10 +31,15 @@ endif()
 # CMetrics Version
 set(CMT_VERSION_MAJOR  0)
 set(CMT_VERSION_MINOR  3)
-set(CMT_VERSION_PATCH  5)
+set(CMT_VERSION_PATCH  6)
 set(CMT_VERSION_STR "${CMT_VERSION_MAJOR}.${CMT_VERSION_MINOR}.${CMT_VERSION_PATCH}")
 
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__")
+# Define __FILENAME__ consistently across Operating Systems
+if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__='\"$(subst ${CMAKE_SOURCE_DIR}/,,$(abspath $<))\"'")
+else()
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__")
+endif()
 
 # Configuration options
 option(CMT_DEV             "Enable development mode"                   No)
@@ -295,19 +300,19 @@ if(CMT_SYSTEM_MACOS)
 
   if (CPACK_GENERATOR MATCHES "productbuild")
     set(CPACK_SET_DESTDIR "ON")
-    configure_file(cpack/macos/welcome.txt.cmakein ${CMAKE_CURRENT_BINARY_DIR}/welcome.txt)
-    configure_file(LICENSE ${CMAKE_CURRENT_BINARY_DIR}/LICENSE.txt)
+    configure_file(cpack/macos/welcome.txt.cmakein ${CMAKE_CURRENT_SOURCE_DIR}/welcome.txt)
+    configure_file(LICENSE ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt)
     find_program(CONVERTER textutil)
     if (NOT CONVERTER)
       message(FATAL_ERROR "textutil not found.")
     endif()
     if (CONVERTER)
-      execute_process(COMMAND ${CONVERTER} -convert html "${CMAKE_SOURCE_DIR}/README.md" -output "${CMAKE_BINARY_DIR}/README.html")
+      execute_process(COMMAND ${CONVERTER} -convert html "${CMAKE_CURRENT_SOURCE_DIR}/README.md" -output "${CMAKE_CURRENT_SOURCE_DIR}/README.html")
     endif()
     set(CPACK_PACKAGE_FILE_NAME "${CMETRICS_PKG}")
-    set(CPACK_RESOURCE_FILE_WELCOME ${CMAKE_CURRENT_BINARY_DIR}/welcome.txt)
-    set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_CURRENT_BINARY_DIR}/LICENSE.txt)
-    set(CPACK_RESOURCE_FILE_README ${CMAKE_CURRENT_BINARY_DIR}/README.html)
+    set(CPACK_RESOURCE_FILE_WELCOME ${CMAKE_CURRENT_SOURCE_DIR}/welcome.txt)
+    set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt)
+    set(CPACK_RESOURCE_FILE_README ${CMAKE_CURRENT_SOURCE_DIR}/README.html)
     set(CPACK_PRODUCTBUILD_IDENTIFIER "com.calyptia.${CPACK_PACKAGE_NAME}")
   endif()
 endif()

lib/cmetrics/include/cmetrics/cmt_decode_prometheus.h

@@ -22,7 +22,6 @@
 
 #include <stdbool.h>
 
-#include "monkey/mk_core/mk_list.h"
 #include <cmetrics/cmetrics.h>
 #include <stdint.h>
 
@@ -35,6 +34,8 @@
 #define CMT_DECODE_PROMETHEUS_PARSE_VALUE_FAILED         60
 #define CMT_DECODE_PROMETHEUS_PARSE_TIMESTAMP_FAILED     70
 
+#define CMT_DECODE_PROMETHEUS_DUPLICATE_SUM_COUNT        10000
+
 #define CMT_DECODE_PROMETHEUS_MAX_LABEL_COUNT 128
 
 enum cmt_decode_prometheus_context_sample_type {
@@ -74,6 +75,10 @@ struct cmt_decode_prometheus_parse_opts {
 };
 
 struct cmt_decode_prometheus_context {
+    union {
+        struct cmt_summary *summary;
+        struct cmt_histogram *histogram;
+    } current;
     struct cmt *cmt;
     struct cmt_decode_prometheus_parse_opts opts;
     int errcode;

lib/cmetrics/markdownlint.rb

@@ -0,0 +1,16 @@
+#!/usr/bin/ruby
+
+# Enable all rules by default
+all
+
+# Extend line length, since each sentence should be on a separate line.
+rule 'MD013', :line_length => 99999, :ignore_code_blocks => true
+
+# Allow in-line HTML
+exclude_rule 'MD033'
+
+# Nested lists should be indented with two spaces.
+rule 'MD007', :indent => 2
+
+# Bash defaulting confuses this and now way to ignore code blocks
+exclude_rule 'MD029'

lib/cmetrics/src/cmt_decode_opentelemetry.c

@@ -49,7 +49,7 @@ static struct cmt_variant *clone_variant(Opentelemetry__Proto__Common__V1__AnyVa
 {
     struct cmt_kvlist  *new_child_kvlist;
     struct cmt_array   *new_child_array;
-    struct cmt_variant *result_instance;
+    struct cmt_variant *result_instance = NULL;
     int                 result;
 
     if (source->value_case == OPENTELEMETRY__PROTO__COMMON__V1__ANY_VALUE__VALUE_STRING_VALUE) {
@@ -111,7 +111,7 @@ static struct cmt_variant *clone_variant(Opentelemetry__Proto__Common__V1__AnyVa
         }
     }
     else if (source->value_case == OPENTELEMETRY__PROTO__COMMON__V1__ANY_VALUE__VALUE_BYTES_VALUE) {
-        result_instance = cmt_variant_create_from_bytes(source->bytes_value.data, source->bytes_value.len);
+        result_instance = cmt_variant_create_from_bytes((char *) source->bytes_value.data, source->bytes_value.len);
     }
 
     return result_instance;
@@ -449,7 +449,7 @@ static int decode_data_point_labels(struct cmt *cmt,
             }
             else if (attribute->value->value_case == OPENTELEMETRY__PROTO__COMMON__V1__ANY_VALUE__VALUE_BYTES_VALUE) {
                 result = append_new_metric_label_value(metric,
-                                                       attribute->value->bytes_value.data,
+                                                       (char *) attribute->value->bytes_value.data,
                                                        attribute->value->bytes_value.len);
             }
             else if (attribute->value->value_case == OPENTELEMETRY__PROTO__COMMON__V1__ANY_VALUE__VALUE_BOOL_VALUE) {
@@ -458,7 +458,7 @@ static int decode_data_point_labels(struct cmt *cmt,
                 result = append_new_metric_label_value(metric, dummy_label_value, 0);
             }
             else if (attribute->value->value_case == OPENTELEMETRY__PROTO__COMMON__V1__ANY_VALUE__VALUE_INT_VALUE) {
-                snprintf(dummy_label_value, sizeof(dummy_label_value) - 1, PRIi64, attribute->value->int_value);
+                snprintf(dummy_label_value, sizeof(dummy_label_value) - 1, "%" PRIi64, attribute->value->int_value);
 
                 result = append_new_metric_label_value(metric, dummy_label_value, 0);
             }
@@ -542,7 +542,7 @@ static int decode_numerical_data_point(struct cmt *cmt,
             value = data_point->as_double;
         }
 
-        cmt_metric_set(sample, data_point->time_unix_nano, data_point->as_double);
+        cmt_metric_set(sample, data_point->time_unix_nano, value);
     }
 
     return result;
@@ -1099,7 +1099,8 @@ int cmt_decode_opentelemetry_create(struct cmt **out_cmt, char *in_buf, size_t i
         return result;
     }
 
-    service_request = opentelemetry__proto__collector__metrics__v1__export_metrics_service_request__unpack(NULL, in_size - *offset, &in_buf[*offset]);
+    service_request = opentelemetry__proto__collector__metrics__v1__export_metrics_service_request__unpack(NULL, in_size - *offset, 
+                                                                                                           (unsigned char *) &in_buf[*offset]);
 
     if (service_request != NULL) {
         result = decode_service_request(cmt, service_request);