diff --git a/lib/cmetrics/.github/workflows/build.yaml b/lib/cmetrics/.github/workflows/build.yaml index b975bf7be1d..42015b80d59 100644 --- a/lib/cmetrics/.github/workflows/build.yaml +++ b/lib/cmetrics/.github/workflows/build.yaml @@ -23,6 +23,11 @@ jobs: with: submodules: true + - name: Set up with Developer Command Prompt for Microsoft Visual C++ + uses: ilammy/msvc-dev-cmd@v1 + with: + toolset: 14.29 # For using VS2019 C++ + - name: Build on ${{ matrix.os }} with vs-2019 run: | .\scripts\win_build.bat @@ -39,10 +44,11 @@ jobs: steps: - name: Set up base image dependencies run: | + sed -i -e "s/^mirrorlist=http:\/\/mirrorlist.centos.org/#mirrorlist=http:\/\/mirrorlist.centos.org/g" /etc/yum.repos.d/CentOS-Base.repo + sed -i -e "s/^#baseurl=http:\/\/mirror.centos.org/baseurl=http:\/\/vault.centos.org/g" /etc/yum.repos.d/CentOS-Base.repo yum -y update && \ yum install -y ca-certificates cmake gcc gcc-c++ git 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 epel-release yum install -y cmake3 shell: bash diff --git a/lib/cmetrics/CMakeLists.txt b/lib/cmetrics/CMakeLists.txt index 68dd66e507c..6509d7a35f4 100644 --- a/lib/cmetrics/CMakeLists.txt +++ b/lib/cmetrics/CMakeLists.txt @@ -6,7 +6,7 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON) # CMetrics Version set(CMT_VERSION_MAJOR 0) set(CMT_VERSION_MINOR 9) -set(CMT_VERSION_PATCH 1) +set(CMT_VERSION_PATCH 3) set(CMT_VERSION_STR "${CMT_VERSION_MAJOR}.${CMT_VERSION_MINOR}.${CMT_VERSION_PATCH}") # Include helpers @@ -241,6 +241,12 @@ if (NOT CMT_HAVE_CFL) COMPONENT headers PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) + install(TARGETS cfl-static + RUNTIME DESTINATION ${CMT_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMT_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMT_INSTALL_LIBDIR} + COMPONENT library) + # xxHash install(FILES lib/cfl/lib/xxhash/xxh3.h DESTINATION ${CMT_INSTALL_INCLUDEDIR} diff --git a/lib/cmetrics/scripts/win_build.bat b/lib/cmetrics/scripts/win_build.bat index f1fb6d87b16..907baf75176 100755 --- a/lib/cmetrics/scripts/win_build.bat +++ b/lib/cmetrics/scripts/win_build.bat @@ -1,6 +1,4 @@ setlocal -call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\VsDevCmd.bat" -path "C:\Program Files (x86)\MSBuild\16.0\Bin;C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin";%path% git submodule update --init --recursive cd build cmake -G "NMake Makefiles" -DCMT_TESTS=On ..\ diff --git a/lib/cmetrics/src/cmt_decode_prometheus.c b/lib/cmetrics/src/cmt_decode_prometheus.c index e33a9ef1670..3a87c34ee74 100644 --- a/lib/cmetrics/src/cmt_decode_prometheus.c +++ b/lib/cmetrics/src/cmt_decode_prometheus.c @@ -200,7 +200,7 @@ static int parse_uint64(const char *in, uint64_t *out) int64_t val; errno = 0; - val = strtol(in, &end, 10); + val = strtoll(in, &end, 10); if (end == in || *end != 0 || errno) { return -1; } diff --git a/lib/ctraces/.github/workflows/build.yaml b/lib/ctraces/.github/workflows/build.yaml index 45710f6c4f2..97b7639e7d1 100644 --- a/lib/ctraces/.github/workflows/build.yaml +++ b/lib/ctraces/.github/workflows/build.yaml @@ -39,10 +39,11 @@ jobs: steps: - name: Set up base image dependencies run: | + sed -i -e "s/^mirrorlist=http:\/\/mirrorlist.centos.org/#mirrorlist=http:\/\/mirrorlist.centos.org/g" /etc/yum.repos.d/CentOS-Base.repo + sed -i -e "s/^#baseurl=http:\/\/mirror.centos.org/baseurl=http:\/\/vault.centos.org/g" /etc/yum.repos.d/CentOS-Base.repo yum -y update && \ yum install -y ca-certificates cmake curl-devel gcc gcc-c++ git 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 epel-release yum install -y cmake3 shell: bash diff --git a/lib/ctraces/.github/workflows/lint.yaml b/lib/ctraces/.github/workflows/lint.yaml index 46471fa5b19..2be0e40c674 100644 --- a/lib/ctraces/.github/workflows/lint.yaml +++ b/lib/ctraces/.github/workflows/lint.yaml @@ -29,4 +29,4 @@ jobs: steps: - uses: actions/checkout@v3 - name: Run markdownlint - uses: actionshub/markdownlint@2.0.2 + uses: actionshub/markdownlint@v3.1.4 diff --git a/lib/ctraces/CMakeLists.txt b/lib/ctraces/CMakeLists.txt index 5f6a96b0f68..425384fcce9 100644 --- a/lib/ctraces/CMakeLists.txt +++ b/lib/ctraces/CMakeLists.txt @@ -27,7 +27,7 @@ endif() # CTraces Version set(CTR_VERSION_MAJOR 0) set(CTR_VERSION_MINOR 5) -set(CTR_VERSION_PATCH 2) +set(CTR_VERSION_PATCH 3) set(CTR_VERSION_STR "${CTR_VERSION_MAJOR}.${CTR_VERSION_MINOR}.${CTR_VERSION_PATCH}") # Define __FILENAME__ consistently across Operating Systems diff --git a/lib/ctraces/examples/otlp-encoder/README.md b/lib/ctraces/examples/otlp-encoder/README.md index 78e65aca35d..ab2bfa0bd01 100644 --- a/lib/ctraces/examples/otlp-encoder/README.md +++ b/lib/ctraces/examples/otlp-encoder/README.md @@ -23,4 +23,3 @@ service: ``` Now you can run the example and see the trace data logged by the collector instance. - diff --git a/lib/ctraces/src/ctr_encode_msgpack.c b/lib/ctraces/src/ctr_encode_msgpack.c index 4c863608830..63714b0af44 100644 --- a/lib/ctraces/src/ctr_encode_msgpack.c +++ b/lib/ctraces/src/ctr_encode_msgpack.c @@ -424,7 +424,12 @@ static void pack_scope_spans(mpack_writer_t *writer, struct cfl_list *scope_span /* scope */ mpack_write_cstr(writer, "scope"); - pack_instrumentation_scope(writer, scope_span->instrumentation_scope); + if (scope_span->instrumentation_scope != NULL) { + pack_instrumentation_scope(writer, scope_span->instrumentation_scope); + } + else { + mpack_write_nil(writer); + } /* spans */ mpack_write_cstr(writer, "spans");