diff --git a/internal/metrics/systeminfo/system_info.go b/internal/metrics/systeminfo/system_info.go index 3a2ec761..02f47a7e 100644 --- a/internal/metrics/systeminfo/system_info.go +++ b/internal/metrics/systeminfo/system_info.go @@ -172,12 +172,12 @@ func (s *SystemInfo) collectDisksInfo(ctx context.Context, lastResult *SystemInf s.Disks = make(map[string]disk.UsageStat, len(partitions)) errs := gperr.NewBuilder("failed to get disks info") for _, partition := range partitions { - diskInfo, err := disk.UsageWithContext(ctx, partition.Mountpoint.Value()) + diskInfo, err := disk.UsageWithContext(ctx, partition.Mountpoint) if err != nil { errs.Add(err) continue } - s.Disks[partition.Device.Value()] = diskInfo + s.Disks[partition.Device] = diskInfo } if errs.HasError() { @@ -320,7 +320,7 @@ func aggregate(entries []*SystemInfo, query url.Values) (total int, result Aggre } m := make(map[string]any, len(entry.Sensors)+1) for _, sensor := range entry.Sensors { - m[sensor.SensorKey.Value()] = sensor.Temperature + m[sensor.SensorKey] = sensor.Temperature } m["timestamp"] = entry.Timestamp aggregated = append(aggregated, m) diff --git a/internal/metrics/systeminfo/system_info_test.go b/internal/metrics/systeminfo/system_info_test.go index 5e464294..d41c6a97 100644 --- a/internal/metrics/systeminfo/system_info_test.go +++ b/internal/metrics/systeminfo/system_info_test.go @@ -11,7 +11,6 @@ import ( "github.com/shirou/gopsutil/v4/mem" "github.com/shirou/gopsutil/v4/net" "github.com/shirou/gopsutil/v4/sensors" - "github.com/yusing/goutils/intern" expect "github.com/yusing/goutils/testing" ) @@ -27,21 +26,21 @@ var ( }, Disks: map[string]disk.UsageStat{ "sda": { - Path: intern.Make("/"), - Fstype: intern.Make("ext4"), + Path: "/", + Fstype: "ext4", Free: 250000000000, Used: 250000000000, }, "nvme0n1": { - Path: intern.Make("/"), - Fstype: intern.Make("zfs"), + Path: "/", + Fstype: "zfs", Free: 250000000000, Used: 250000000000, }, }, DisksIO: map[string]*disk.IOCountersStat{ "media": { - Name: intern.Make("media"), + Name: "media", ReadBytes: 1000000, WriteBytes: 2000000, IOCountersStatExtra: disk.IOCountersStatExtra{ @@ -51,7 +50,7 @@ var ( }, }, "nvme0n1": { - Name: intern.Make("nvme0n1"), + Name: "nvme0n1", ReadBytes: 1000000, WriteBytes: 2000000, IOCountersStatExtra: disk.IOCountersStatExtra{ @@ -69,11 +68,11 @@ var ( }, Sensors: []sensors.TemperatureStat{ { - SensorKey: intern.Make("cpu_temp"), + SensorKey: "cpu_temp", Temperature: 30.0, }, { - SensorKey: intern.Make("gpu_temp"), + SensorKey: "gpu_temp", Temperature: 40.0, }, },