in_node_exporter_metrics: add file path to error messages

rossigee · rossigee · commit 44bf2d2665c6 · 2026-05-22T17:34:05.000+07:00
Improve error logs to indicate which file path failed when reading
metrics, making it easier to debug missing hardware sensors or
permissions issues.

Signed-off-by: Ross Golder &lt;ross@golder.org&gt;
diff --git a/plugins/in_node_exporter_metrics/ne_cpu_linux.c b/plugins/in_node_exporter_metrics/ne_cpu_linux.c
@@ -112,7 +112,7 @@ static int cpu_thermal_update(struct flb_ne *ctx, uint64_t ts)
         entry = mk_list_entry(head, struct flb_slist_entry, _head);
 
         /* Core ID */
-        ret = ne_utils_file_read_uint64(ctx->path_sysfs,
+        ret = ne_utils_file_read_uint64(ctx, ctx->path_sysfs,
                                         entry->str,
                                         "topology", "core_id",
                                         &core_id);
@@ -121,7 +121,7 @@ static int cpu_thermal_update(struct flb_ne *ctx, uint64_t ts)
         }
 
         /* Physical ID */
-        ret = ne_utils_file_read_uint64(ctx->path_sysfs,
+        ret = ne_utils_file_read_uint64(ctx, ctx->path_sysfs,
                                         entry->str,
                                         "topology", "physical_package_id",
                                         &physical_package_id);
@@ -130,7 +130,7 @@ static int cpu_thermal_update(struct flb_ne *ctx, uint64_t ts)
         }
 
         /* Package Metric: node_cpu_core_throttles_total */
-        ret = ne_utils_file_read_uint64(ctx->path_sysfs,
+        ret = ne_utils_file_read_uint64(ctx, ctx->path_sysfs,
                                         entry->str,
                                         "thermal_throttle", "core_throttle_count",
                                         &core_throttle_count);
@@ -150,7 +150,7 @@ static int cpu_thermal_update(struct flb_ne *ctx, uint64_t ts)
         }
 
         /* Package Metric: node_cpu_package_throttles_total */
-        ret = ne_utils_file_read_uint64(ctx->path_sysfs,
+        ret = ne_utils_file_read_uint64(ctx, ctx->path_sysfs,
                                         entry->str,
                                         "thermal_throttle", "package_throttle_count",
                                         &package_throttle_count);
@@ -307,7 +307,7 @@ static int cpu_stat_update(struct flb_ne *ctx, uint64_t ts)
     struct flb_slist_entry *line;
     struct cpu_stat_info st = {0};
 
-    ret = ne_utils_file_read_lines(ctx->path_procfs, "/stat", &list);
+    ret = ne_utils_file_read_lines(ctx, ctx->path_procfs, "/stat", &list);
     if (ret == -1) {
         return -1;
     }
diff --git a/plugins/in_node_exporter_metrics/ne_cpufreq_linux.c b/plugins/in_node_exporter_metrics/ne_cpufreq_linux.c
@@ -118,7 +118,7 @@ static int cpufreq_update(struct flb_ne *ctx)
         cpu_id++;
 
         /* node_cpu_frequency_hertz */
-        ret = ne_utils_file_read_uint64(ctx->path_sysfs,
+        ret = ne_utils_file_read_uint64(ctx, ctx->path_sysfs,
                                         entry->str, "cpufreq", "cpuinfo_cur_freq",
                                         &val);
         if (ret == 0) {
@@ -128,7 +128,7 @@ static int cpufreq_update(struct flb_ne *ctx)
         }
 
         /* node_cpu_frequency_max_hertz */
-        ret = ne_utils_file_read_uint64(ctx->path_sysfs,
+        ret = ne_utils_file_read_uint64(ctx, ctx->path_sysfs,
                                         entry->str, "cpufreq", "cpuinfo_max_freq",
                                         &val);
         if (ret == 0) {
@@ -138,7 +138,7 @@ static int cpufreq_update(struct flb_ne *ctx)
         }
 
         /* node_cpu_frequency_min_hertz */
-        ret = ne_utils_file_read_uint64(ctx->path_sysfs,
+        ret = ne_utils_file_read_uint64(ctx, ctx->path_sysfs,
                                         entry->str, "cpufreq", "cpuinfo_min_freq",
                                         &val);
         if (ret == 0) {
@@ -149,7 +149,7 @@ static int cpufreq_update(struct flb_ne *ctx)
 
 
         /* node_cpu_scaling_frequency_hertz */
-        ret = ne_utils_file_read_uint64(ctx->path_sysfs,
+        ret = ne_utils_file_read_uint64(ctx, ctx->path_sysfs,
                                         entry->str, "cpufreq", "scaling_cur_freq",
                                         &val);
         if (ret == 0) {
@@ -159,7 +159,7 @@ static int cpufreq_update(struct flb_ne *ctx)
         }
 
         /* node_cpu_scaling_frequency_max_hertz */
-        ret = ne_utils_file_read_uint64(ctx->path_sysfs,
+        ret = ne_utils_file_read_uint64(ctx, ctx->path_sysfs,
                                         entry->str, "cpufreq", "scaling_max_freq",
                                         &val);
         if (ret == 0) {
@@ -169,7 +169,7 @@ static int cpufreq_update(struct flb_ne *ctx)
         }
 
         /* node_cpu_frequency_min_hertz */
-        ret = ne_utils_file_read_uint64(ctx->path_sysfs,
+        ret = ne_utils_file_read_uint64(ctx, ctx->path_sysfs,
                                         entry->str, "cpufreq", "scaling_min_freq",
                                         &val);
         if (ret == 0) {
diff --git a/plugins/in_node_exporter_metrics/ne_diskstats_linux.c b/plugins/in_node_exporter_metrics/ne_diskstats_linux.c
@@ -404,7 +404,7 @@ static int diskstats_update(struct flb_ne *ctx)
     mk_list_init(&list);
     mk_list_init(&split_list);
 
-    ret = ne_utils_file_read_lines(ctx->path_procfs, "/diskstats", &list);
+    ret = ne_utils_file_read_lines(ctx, ctx->path_procfs, "/diskstats", &list);
     if (ret == -1) {
         return -1;
     }
diff --git a/plugins/in_node_exporter_metrics/ne_filefd_linux.c b/plugins/in_node_exporter_metrics/ne_filefd_linux.c
@@ -58,7 +58,7 @@ static int filefd_update(struct flb_ne *ctx)
     struct flb_slist_entry *max;
 
     mk_list_init(&list);
-    ret = ne_utils_file_read_lines(ctx->path_procfs, "/sys/fs/file-nr", &list);
+    ret = ne_utils_file_read_lines(ctx, ctx->path_procfs, "/sys/fs/file-nr", &list);
     if (ret == -1) {
         return -1;
     }
diff --git a/plugins/in_node_exporter_metrics/ne_hwmon_linux.c b/plugins/in_node_exporter_metrics/ne_hwmon_linux.c
@@ -185,14 +185,14 @@ static void hwmon_process_sensor(struct flb_ne *ctx, const char *chip_path,
     }
 
     /* read input value */
-    ret = ne_utils_file_read_uint64(ctx->path_sysfs, sensor_path,
+    ret = ne_utils_file_read_uint64(ctx, ctx->path_sysfs, sensor_path,
                                     NULL, NULL, &val);
     if (ret != 0) {
         return;
     }
 
     snprintf(label_name, sizeof(label_name) - 1, "%s_label", sensor_name);
-    if (ne_utils_file_read_sds(ctx->path_sysfs, chip_path,
+    if (ne_utils_file_read_sds(ctx, ctx->path_sysfs, chip_path,
                                label_name, NULL, &label) == 0) {
         sensor_label = label;
     }
@@ -206,15 +206,15 @@ static void hwmon_process_sensor(struct flb_ne *ctx, const char *chip_path,
                       2, (char *[]) {(char *) chip_name, (char *) sensor_label});
 
         snprintf(file_tmp, sizeof(file_tmp) - 1, "%s_max", sensor_name);
-        if (ne_utils_file_read_uint64(ctx->path_sysfs, chip_path,
+        if (ne_utils_file_read_uint64(ctx, ctx->path_sysfs, chip_path,
                                        file_tmp, NULL, &val) == 0) {
             cmt_gauge_set(ctx->hwmon_temp_max_celsius, tstamp,
                           ((double) val) / 1000.0,
                           2, (char *[]) {(char *) chip_name, (char *) sensor_label});
         }
 
         snprintf(file_tmp, sizeof(file_tmp) - 1, "%s_crit", sensor_name);
-        if (ne_utils_file_read_uint64(ctx->path_sysfs, chip_path,
+        if (ne_utils_file_read_uint64(ctx, ctx->path_sysfs, chip_path,
                                        file_tmp, NULL, &val) == 0) {
             cmt_gauge_set(ctx->hwmon_temp_crit_celsius, tstamp,
                           ((double) val) / 1000.0,
@@ -269,7 +269,7 @@ static int ne_hwmon_update(struct flb_input_instance *ins,
     mk_list_foreach(head, &hwmons) {
         entry = mk_list_entry(head, struct flb_slist_entry, _head);
 
-        if (ne_utils_file_read_sds(ctx->path_sysfs, entry->str,
+        if (ne_utils_file_read_sds(ctx, ctx->path_sysfs, entry->str,
                                    "name", NULL, &chip) != 0) {
             continue;
         }
diff --git a/plugins/in_node_exporter_metrics/ne_loadavg_linux.c b/plugins/in_node_exporter_metrics/ne_loadavg_linux.c
@@ -67,7 +67,7 @@ static int loadavg_update(struct flb_ne *ctx)
     mk_list_init(&list);
     mk_list_init(&split_list);
 
-    ret = ne_utils_file_read_lines(ctx->path_procfs, "/loadavg", &list);
+    ret = ne_utils_file_read_lines(ctx, ctx->path_procfs, "/loadavg", &list);
     if (ret == -1) {
         return -1;
     }
diff --git a/plugins/in_node_exporter_metrics/ne_meminfo_linux.c b/plugins/in_node_exporter_metrics/ne_meminfo_linux.c
@@ -53,7 +53,7 @@ static int meminfo_configure(struct flb_ne *ctx)
     mk_list_init(&list);
     mk_list_init(&split_list);
 
-    ret = ne_utils_file_read_lines(ctx->path_procfs, "/meminfo", &list);
+    ret = ne_utils_file_read_lines(ctx, ctx->path_procfs, "/meminfo", &list);
     if (ret == -1) {
         return -1;
     }
@@ -206,7 +206,7 @@ static int meminfo_update(struct flb_ne *ctx)
     struct flb_slist_entry *entry;
 
     mk_list_init(&list);
-    ret = ne_utils_file_read_lines(ctx->path_procfs, "/meminfo", &list);
+    ret = ne_utils_file_read_lines(ctx, ctx->path_procfs, "/meminfo", &list);
     if (ret == -1) {
         return -1;
     }
diff --git a/plugins/in_node_exporter_metrics/ne_netdev_linux.c b/plugins/in_node_exporter_metrics/ne_netdev_linux.c
@@ -98,7 +98,7 @@ static int netdev_configure(struct flb_ne *ctx)
     mk_list_init(&rx_list);
     mk_list_init(&tx_list);
 
-    ret = ne_utils_file_read_lines(ctx->path_procfs, "/net/dev", &list);
+    ret = ne_utils_file_read_lines(ctx, ctx->path_procfs, "/net/dev", &list);
     if (ret == -1) {
         return -1;
     }
@@ -236,7 +236,7 @@ static int netdev_update(struct flb_ne *ctx)
     mk_list_init(&rx_list);
     mk_list_init(&tx_list);
 
-    ret = ne_utils_file_read_lines(ctx->path_procfs, "/net/dev", &list);
+    ret = ne_utils_file_read_lines(ctx, ctx->path_procfs, "/net/dev", &list);
     if (ret == -1) {
         return -1;
     }
diff --git a/plugins/in_node_exporter_metrics/ne_netstat_linux.c b/plugins/in_node_exporter_metrics/ne_netstat_linux.c
@@ -215,7 +215,7 @@ static int netstat_update(struct flb_ne *ctx)
     int prev_proto;
 
     mk_list_init(&list);
-    ret = ne_utils_file_read_lines(ctx->path_procfs, "/net/snmp", &list);
+    ret = ne_utils_file_read_lines(ctx, ctx->path_procfs, "/net/snmp", &list);
     if (ret == -1) {
         return -1;
     }
diff --git a/plugins/in_node_exporter_metrics/ne_nvme_linux.c b/plugins/in_node_exporter_metrics/ne_nvme_linux.c
@@ -105,7 +105,7 @@ static int nvme_get_entry_value(struct flb_ne *ctx,
     if (check_path_for_sysfs(ctx, nvme_info->str, entry_path) != 0) {
         return -1;
     }
-    ret = ne_utils_file_read_lines(nvme_info->str, nvme_sysentry, out_info_list);
+    ret = ne_utils_file_read_lines(ctx, nvme_info->str, nvme_sysentry, out_info_list);
     if (ret == -1) {
         return ret;
     }
diff --git a/plugins/in_node_exporter_metrics/ne_processes_linux.c b/plugins/in_node_exporter_metrics/ne_processes_linux.c
@@ -195,7 +195,7 @@ static int processes_thread_update(struct flb_ne *ctx, flb_sds_t pid_str, flb_sd
         }
 
         mk_list_init(&stat_list);
-        ret = ne_utils_file_read_lines(thread->str, "/stat", &stat_list);
+        ret = ne_utils_file_read_lines(ctx,thread->str, "/stat", &stat_list);
         if (ret == -1) {
             continue;
         }
@@ -271,7 +271,7 @@ static int processes_update(struct flb_ne *ctx)
 
     ts = cfl_time_now();
 
-    ret = ne_utils_file_read_uint64(ctx->path_procfs, "/sys", "kernel", "threads-max", &val);
+    ret = ne_utils_file_read_uint64(ctx, ctx->path_procfs, "/sys", "kernel", "threads-max", &val);
     if (ret == -1) {
         return -1;
     }
@@ -282,7 +282,7 @@ static int processes_update(struct flb_ne *ctx)
                       (double)val, 0, NULL);
     }
 
-    ret = ne_utils_file_read_uint64(ctx->path_procfs, "/sys", "kernel", "pid_max", &val);
+    ret = ne_utils_file_read_uint64(ctx, ctx->path_procfs, "/sys", "kernel", "pid_max", &val);
     if (ret == -1) {
         return -1;
     }
@@ -313,7 +313,7 @@ static int processes_update(struct flb_ne *ctx)
         }
 
         mk_list_init(&stat_list);
-        ret = ne_utils_file_read_lines(process->str, "/stat", &stat_list);
+        ret = ne_utils_file_read_lines(ctx,process->str, "/stat", &stat_list);
         if (ret == -1) {
             continue;
         }
diff --git a/plugins/in_node_exporter_metrics/ne_sockstat_linux.c b/plugins/in_node_exporter_metrics/ne_sockstat_linux.c
@@ -176,7 +176,7 @@ static int sockstat_update(struct flb_ne *ctx)
     struct stat st;
 
     mk_list_init(&list);
-    ret = ne_utils_file_read_lines(ctx->path_procfs, "/net/sockstat", &list);
+    ret = ne_utils_file_read_lines(ctx, ctx->path_procfs, "/net/sockstat", &list);
     if (ret == -1) {
         return -1;
     }
@@ -313,7 +313,7 @@ static int sockstat_update(struct flb_ne *ctx)
         return 0;
     }
     mk_list_init(&list);
-    ret = ne_utils_file_read_lines(ctx->path_procfs, "/net/sockstat6", &list);
+    ret = ne_utils_file_read_lines(ctx, ctx->path_procfs, "/net/sockstat6", &list);
     if (ret != -1) {
         mk_list_foreach(head, &list) {
             line = mk_list_entry(head, struct flb_slist_entry, _head);
diff --git a/plugins/in_node_exporter_metrics/ne_stat_linux.c b/plugins/in_node_exporter_metrics/ne_stat_linux.c
@@ -83,7 +83,7 @@ static int stat_update(struct flb_ne *ctx)
     struct flb_slist_entry *s_val;
 
     mk_list_init(&list);
-    ret = ne_utils_file_read_lines(ctx->path_procfs, "/stat", &list);
+    ret = ne_utils_file_read_lines(ctx, ctx->path_procfs, "/stat", &list);
     if (ret == -1) {
         flb_plg_error(ctx->ins, "failed to read %s/stat", ctx->path_procfs);
         return -1;
diff --git a/plugins/in_node_exporter_metrics/ne_thermalzone_linux.c b/plugins/in_node_exporter_metrics/ne_thermalzone_linux.c
@@ -122,15 +122,15 @@ static int ne_thermalzone_update_thermal_zones(struct flb_ne *ctx)
         entry = mk_list_entry(head, struct flb_slist_entry, _head);
 
         /* Core ID */
-        ret = ne_utils_file_read_uint64(ctx->path_sysfs,
+        ret = ne_utils_file_read_uint64(ctx, ctx->path_sysfs,
                                         entry->str,
                                         "temp", NULL,
                                         &temp);
         if (ret != 0) {
             continue;
         }
 
-        ret = ne_utils_file_read_sds(ctx->path_sysfs, entry->str, "type", NULL, &type);
+        ret = ne_utils_file_read_sds(ctx, ctx->path_sysfs, entry->str, "type", NULL, &type);
         if (ret != 0) {
             flb_plg_error(ctx->ins, "unable to get type for zone: %s", entry->str);
             continue;
@@ -206,23 +206,23 @@ static int ne_thermalzone_update_cooling_devices(struct flb_ne *ctx)
         entry = mk_list_entry(head, struct flb_slist_entry, _head);
 
         /* Core ID */
-        ret = ne_utils_file_read_uint64(ctx->path_sysfs,
+        ret = ne_utils_file_read_uint64(ctx, ctx->path_sysfs,
                                         entry->str,
                                         "cur_state", NULL,
                                         &cur_state);
         if (ret != 0) {
             continue;
         }
 
-        ret = ne_utils_file_read_uint64(ctx->path_sysfs,
+        ret = ne_utils_file_read_uint64(ctx, ctx->path_sysfs,
                                         entry->str,
                                         "max_state", NULL,
                                         &max_state);
         if (ret != 0) {
             continue;
         }
 
-        ret = ne_utils_file_read_sds(ctx->path_sysfs, entry->str, "type", NULL, &type);
+        ret = ne_utils_file_read_sds(ctx, ctx->path_sysfs, entry->str, "type", NULL, &type);
         if (ret != 0) {
             flb_plg_error(ctx->ins, "unable to get type for zone: %s", entry->str);
             continue;
diff --git a/plugins/in_node_exporter_metrics/ne_utils.c b/plugins/in_node_exporter_metrics/ne_utils.c
diff --git a/plugins/in_node_exporter_metrics/ne_utils.h b/plugins/in_node_exporter_metrics/ne_utils.h
diff --git a/plugins/in_node_exporter_metrics/ne_vmstat_linux.c b/plugins/in_node_exporter_metrics/ne_vmstat_linux.c

Original file line number	Diff line number	Diff line change
`@@ -404,7 +404,7 @@ static int diskstats_update(struct flb_ne *ctx)`
`404`	`404`	`mk_list_init(&list);`
`405`	`405`	`mk_list_init(&split_list);`
`406`	`406`
`407`		`- ret = ne_utils_file_read_lines(ctx->path_procfs, "/diskstats", &list);`
	`407`	`+ ret = ne_utils_file_read_lines(ctx, ctx->path_procfs, "/diskstats", &list);`
`408`	`408`	`if (ret == -1) {`
`409`	`409`	`return -1;`
`410`	`410`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ static int filefd_update(struct flb_ne *ctx)`
`58`	`58`	`struct flb_slist_entry *max;`
`59`	`59`
`60`	`60`	`mk_list_init(&list);`
`61`		`- ret = ne_utils_file_read_lines(ctx->path_procfs, "/sys/fs/file-nr", &list);`
	`61`	`+ ret = ne_utils_file_read_lines(ctx, ctx->path_procfs, "/sys/fs/file-nr", &list);`
`62`	`62`	`if (ret == -1) {`
`63`	`63`	`return -1;`
`64`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ static int loadavg_update(struct flb_ne *ctx)`
`67`	`67`	`mk_list_init(&list);`
`68`	`68`	`mk_list_init(&split_list);`
`69`	`69`
`70`		`- ret = ne_utils_file_read_lines(ctx->path_procfs, "/loadavg", &list);`
	`70`	`+ ret = ne_utils_file_read_lines(ctx, ctx->path_procfs, "/loadavg", &list);`
`71`	`71`	`if (ret == -1) {`
`72`	`72`	`return -1;`
`73`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,7 @@ static int netstat_update(struct flb_ne *ctx)`
`215`	`215`	`int prev_proto;`
`216`	`216`
`217`	`217`	`mk_list_init(&list);`
`218`		`- ret = ne_utils_file_read_lines(ctx->path_procfs, "/net/snmp", &list);`
	`218`	`+ ret = ne_utils_file_read_lines(ctx, ctx->path_procfs, "/net/snmp", &list);`
`219`	`219`	`if (ret == -1) {`
`220`	`220`	`return -1;`
`221`	`221`	`}`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ static int nvme_get_entry_value(struct flb_ne *ctx,`
`105`	`105`	`if (check_path_for_sysfs(ctx, nvme_info->str, entry_path) != 0) {`
`106`	`106`	`return -1;`
`107`	`107`	`}`
`108`		`- ret = ne_utils_file_read_lines(nvme_info->str, nvme_sysentry, out_info_list);`
	`108`	`+ ret = ne_utils_file_read_lines(ctx, nvme_info->str, nvme_sysentry, out_info_list);`
`109`	`109`	`if (ret == -1) {`
`110`	`110`	`return ret;`
`111`	`111`	`}`