Skip to content

Commit

Permalink
lib: cmetrics: upgrade to v0.9.9
Browse files Browse the repository at this point in the history 
Signed-off-by: Eduardo Silva <[email protected]>
  • Loading branch information
@edsiper
edsiper committed Nov 5, 2024
1 parent df81bf4 commit 953f085
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 39 deletions.
2 changes: 1 addition & 1 deletion lib/cmetrics/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 8)
set(CMT_VERSION_PATCH 9)
set(CMT_VERSION_STR "${CMT_VERSION_MAJOR}.${CMT_VERSION_MINOR}.${CMT_VERSION_PATCH}")

# Include helpers
Expand Down
69 changes: 31 additions & 38 deletions lib/cmetrics/src/cmt_encode_opentelemetry.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ static inline void otlp_kvpair_destroy(Opentelemetry__Proto__Common__V1__KeyValu
{
if (kvpair != NULL) {
if (kvpair->key != NULL) {
free(kvpair->key);
cfl_sds_destroy(kvpair->key);
}

if (kvpair->value != NULL) {
Expand Down Expand Up @@ -323,7 +323,7 @@ static inline void otlp_any_value_destroy(Opentelemetry__Proto__Common__V1__AnyV
if (value != NULL) {
if (value->value_case == OPENTELEMETRY__PROTO__COMMON__V1__ANY_VALUE__VALUE_STRING_VALUE) {
if (value->string_value != NULL) {
free(value->string_value);
cfl_sds_destroy(value->string_value);
}
}
else if (value->value_case == OPENTELEMETRY__PROTO__COMMON__V1__ANY_VALUE__VALUE_ARRAY_VALUE) {
Expand Down Expand Up @@ -494,21 +494,19 @@ static inline Opentelemetry__Proto__Common__V1__KeyValue *cfl_variant_kvpair_to_
pair = otlp_kvpair_value_initialize();

if (pair != NULL) {
pair->key = strdup(input_pair->key);
pair->key = cfl_sds_create(input_pair->key);

if (pair->key != NULL) {
pair->value = cfl_variant_to_otlp_any_value(input_pair->val);

if (pair->value == NULL) {
free(pair->key);

cfl_sds_destroy(pair->key);
pair->key = NULL;
}
}

if (pair->key == NULL) {
free(pair);

pair = NULL;
}
}
Expand Down Expand Up @@ -649,11 +647,9 @@ static inline Opentelemetry__Proto__Common__V1__AnyValue *cfl_variant_string_to_
result = otlp_any_value_initialize(CFL_VARIANT_STRING, 0);

if (result != NULL) {
result->string_value = strdup(value->data.as_string);

result->string_value = cfl_sds_create(value->data.as_string);
if (result->string_value == NULL) {
otlp_any_value_destroy(result);

result = NULL;
}
}
Expand Down Expand Up @@ -1061,50 +1057,49 @@ static Opentelemetry__Proto__Common__V1__InstrumentationScope *
return NULL;
}

/* cmetrics: retrieve attributes and metadata fields */
attributes = fetch_metadata_kvlist_key(scope_root, "attributes");
metadata = fetch_metadata_kvlist_key(scope_root, "metadata");

if (cfl_kvlist_count(attributes) == 0 &&
cfl_kvlist_count(metadata) == 0) {
return NULL;
}

/* create scope */
scope = calloc(1, sizeof(Opentelemetry__Proto__Common__V1__InstrumentationScope));
if (scope == NULL) {
*error_detection_flag = CMT_TRUE;

return NULL;
}

opentelemetry__proto__common__v1__instrumentation_scope__init(scope);

scope->attributes = cfl_kvlist_to_otlp_kvpair_list(attributes);
/* attributes */
if (attributes && cfl_kvlist_count(attributes) > 0) {
scope->attributes = cfl_kvlist_to_otlp_kvpair_list(attributes);

if (scope->attributes == NULL) {
*error_detection_flag = CMT_TRUE;
}

scope->n_attributes = cfl_kvlist_count(attributes);
if (scope->attributes == NULL) {
*error_detection_flag = CMT_TRUE;
}

if (!(*error_detection_flag)) {
scope->dropped_attributes_count = (uint32_t) fetch_metadata_int64_key(
metadata,
"dropped_attributes_count",
error_detection_flag);
scope->n_attributes = cfl_kvlist_count(attributes);
}

if (!(*error_detection_flag)) {
scope->name = fetch_metadata_string_key(metadata, "name", error_detection_flag);
}
/* scope metadata */
if (metadata) {
if (!(*error_detection_flag)) {
scope->dropped_attributes_count = (uint32_t) fetch_metadata_int64_key(
metadata,
"dropped_attributes_count",
error_detection_flag);
}

if (!(*error_detection_flag)) {
scope->version = fetch_metadata_string_key(metadata, "version", error_detection_flag);
if (!(*error_detection_flag)) {
scope->name = fetch_metadata_string_key(metadata, "name", error_detection_flag);
}

if (!(*error_detection_flag)) {
scope->version = fetch_metadata_string_key(metadata, "version", error_detection_flag);
}
}

if (*error_detection_flag &&
scope != NULL) {
if (*error_detection_flag && scope != NULL) {
destroy_instrumentation_scope(scope);

scope = NULL;
}

Expand Down Expand Up @@ -1205,13 +1200,11 @@ static void destroy_attribute(Opentelemetry__Proto__Common__V1__KeyValue *attrib
{
if (attribute != NULL) {
if (attribute->value != NULL) {
if (attribute->value->value_case == \
OPENTELEMETRY__PROTO__COMMON__V1__ANY_VALUE__VALUE_STRING_VALUE) {
if (attribute->value->value_case == OPENTELEMETRY__PROTO__COMMON__V1__ANY_VALUE__VALUE_STRING_VALUE) {
if (is_string_releaseable(attribute->value->string_value)) {
cfl_sds_destroy(attribute->value->string_value);
}
}

free(attribute->value);
}

Expand Down

0 comments on commit 953f085

Please sign in to comment.