in_windows_exporter_metrics: Support retrival of second values of perflib

Signed-off-by: Hiroshi Hatake <[email protected]>

Author: cosmo0920

plugins/in_windows_exporter_metrics/we_metric.c

@@ -201,6 +201,10 @@ void we_deinitialize_perflib_metric_sources(struct we_perflib_metric_source *sou
     for (source_index = 0 ;
          sources[source_index].name != NULL;
          source_index++) {
+        if (sources[source_index].name != NULL) {
+            flb_free(sources[source_index].name);
+        }
+
         if (sources[source_index].label_set_size) {
             flb_sds_destroy(sources[source_index].label_set[0]);
             flb_free(sources[source_index].label_set);
@@ -215,10 +219,11 @@ int we_initialize_perflib_metric_sources(
 {
     size_t                           source_array_size;
     struct we_perflib_metric_source *source_array_copy;
-    struct we_perflib_metric_spec   *source_entry;
+    struct we_perflib_metric_source *source_entry;
     size_t                           source_index;
     size_t                           source_count;
     int                              result;
+    char                            *flag_ptr;
 
     if (out_sources == NULL) {
         return -1;
@@ -241,7 +246,7 @@ int we_initialize_perflib_metric_sources(
     source_array_size  = sizeof(struct we_perflib_metric_source);
     source_array_size *= (source_count + 1);
 
-    source_array_copy = (struct we_perflib_metric_spec *) flb_calloc(1, source_array_size);
+    source_array_copy = (struct we_perflib_metric_source *) flb_calloc(1, source_array_size);
 
     if (source_array_copy == NULL) {
         return -4;
@@ -252,6 +257,23 @@ int we_initialize_perflib_metric_sources(
     for (source_index = 0 ; source_index < source_count; source_index++) {
         source_entry = &source_array_copy[source_index];
 
+        source_entry->name = flb_strdup(source_entry->name);
+        if (source_entry->name == NULL) {
+            /* Handle memory allocation failure */
+            we_deinitialize_perflib_metric_sources(source_array_copy);
+            flb_free(source_array_copy);
+            return -1; /* Or appropriate error code */
+        }
+
+        /* Now it is safe to search and modify the writable copy */
+        source_entry->use_secondary_value = FLB_FALSE;
+        flag_ptr = strstr(source_entry->name, ",secondvalue");
+
+        if (flag_ptr != NULL) {
+            source_entry->use_secondary_value = FLB_TRUE;
+            *flag_ptr = '\0'; /* This now modifies the heap copy, not read-only memory */
+        }
+
         result = we_expand_perflib_metric_source_labels(source_entry);
 
         if (result != 0) {

plugins/in_windows_exporter_metrics/we_metric.h

@@ -43,6 +43,7 @@ struct we_perflib_metric_source {
     char                          *raw_label_set;
     char                         **label_set;
     size_t                         label_set_size;
+    int                            use_secondary_value;
 };
 
 #define WE_PERFLIB_SPEC(type_, name_, description_, raw_label_set_) \

plugins/in_windows_exporter_metrics/we_perflib.c

@@ -24,10 +24,15 @@
 #include "we_metric.h"
 #include "we_perflib.h"
 
-double we_perflib_get_adjusted_counter_value(struct we_perflib_counter *counter)
+double we_perflib_get_adjusted_counter_value(struct we_perflib_counter *counter,
+                                             struct we_perflib_metric_source *source)
 {
     double result;
 
+    if (source->use_secondary_value) {
+        return (double) counter->secondary_value.as_qword;
+    }
+
     result = (double) counter->primary_value.as_qword;
 
     switch(counter->definition->type) {
@@ -625,6 +630,7 @@ static int we_perflib_process_counter(
                     struct we_perflib_counter            **out_counter)
 {
     struct we_perflib_counter *perflib_instance_counter;
+    uint32_t counter_type = counter_definition->type;
 
     perflib_instance_counter = we_perflib_create_counter(counter_definition);
 
@@ -636,6 +642,18 @@ static int we_perflib_process_counter(
            &input_data_block[counter_definition->offset],
            counter_definition->size);
 
+    if (counter_type == PERF_AVERAGE_BULK ||
+        counter_type == PERF_RAW_FRACTION ||
+        counter_type == PERF_100NSEC_TIMER_INV ||
+        counter_type == PERF_COUNTER_TIMER_INV ||
+        counter_type == PERF_100NSEC_MULTI_TIMER_INV ||
+        counter_type == PERF_COUNTER_MULTI_TIMER_INV) {
+
+        memcpy(&perflib_instance_counter->secondary_value,
+               &input_data_block[counter_definition->offset + counter_definition->size],
+               sizeof(union we_perflib_value));
+    }
+
     if (counter_definition->size > sizeof(union we_perflib_value)) {
         we_perflib_destroy_counter(perflib_instance_counter);
 
@@ -1024,12 +1042,12 @@ int we_perflib_update_counters(struct flb_we                   *ctx,
 
                 if (metric_source->parent->type == CMT_COUNTER) {
                     cmt_counter_set(metric_entry, timestamp,
-                                    we_perflib_get_adjusted_counter_value(counter),
+                                    we_perflib_get_adjusted_counter_value(counter, metric_source),
                                     metric_label_count, metric_label_list);
                 }
                 else if (metric_source->parent->type == CMT_GAUGE) {
                     cmt_gauge_set(metric_entry, timestamp,
-                                  we_perflib_get_adjusted_counter_value(counter),
+                                  we_perflib_get_adjusted_counter_value(counter, metric_source),
                                   metric_label_count, metric_label_list);
                 }
             }