Skip to content

Commit 69ee055

Browse files
committed
lib: cmetrics: upgrade to v0.6.3
Signed-off-by: Eduardo Silva <[email protected]>
1 parent 1730a13 commit 69ee055

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

lib/cmetrics/CMakeLists.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@ project(cmetrics C)
33
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
44
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
55

6+
# CMetrics Version
7+
set(CMT_VERSION_MAJOR 0)
8+
set(CMT_VERSION_MINOR 6)
9+
set(CMT_VERSION_PATCH 3)
10+
set(CMT_VERSION_STR "${CMT_VERSION_MAJOR}.${CMT_VERSION_MINOR}.${CMT_VERSION_PATCH}")
11+
612
# Include helpers
713
include(cmake/macros.cmake)
814
include(CheckCSourceCompiles)
@@ -54,12 +60,6 @@ if(NOT MSVC)
5460
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
5561
endif()
5662

57-
# CMetrics Version
58-
set(CMT_VERSION_MAJOR 0)
59-
set(CMT_VERSION_MINOR 6)
60-
set(CMT_VERSION_PATCH 2)
61-
set(CMT_VERSION_STR "${CMT_VERSION_MAJOR}.${CMT_VERSION_MINOR}.${CMT_VERSION_PATCH}")
62-
6363
# Define __CMT_FILENAME__ consistently across Operating Systems
6464
if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows")
6565
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__CMT_FILENAME__='\"$(subst ${CMAKE_SOURCE_DIR}/,,$(abspath $<))\"'")

lib/cmetrics/src/cmt_decode_opentelemetry.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,9 @@ static struct cfl_variant *clone_variant(Opentelemetry__Proto__Common__V1__AnyVa
5050
struct cfl_variant *result_instance = NULL;
5151
int result;
5252

53+
if (source == NULL) {
54+
return NULL;
55+
}
5356
if (source->value_case == OPENTELEMETRY__PROTO__COMMON__V1__ANY_VALUE__VALUE_STRING_VALUE) {
5457
result_instance = cfl_variant_create_from_string(source->string_value);
5558
}

0 commit comments

Comments
 (0)