metrics: fix metrics collection

This commit is contained in:
yusing 2025-02-24 05:36:28 +08:00
parent 8d06f7cf02
commit f455251645

View file

@ -236,7 +236,7 @@ func (s *SystemInfo) collectDisksInfo(ctx context.Context, lastResult *SystemInf
} }
} }
partitions, err := disk.Partitions(false) partitions, err := disk.PartitionsWithContext(ctx, false)
if err != nil { if err != nil {
return err return err
} }
@ -287,11 +287,8 @@ func (s *SystemInfo) collectNetworkInfo(ctx context.Context, lastResult *SystemI
func (s *SystemInfo) collectSensorsInfo(ctx context.Context) error { func (s *SystemInfo) collectSensorsInfo(ctx context.Context) error {
sensorsInfo, err := sensors.TemperaturesWithContext(ctx) sensorsInfo, err := sensors.TemperaturesWithContext(ctx)
if err != nil {
return err
}
s.Sensors = sensorsInfo s.Sensors = sensorsInfo
return nil return err
} }
// explicitly implement MarshalJSON to avoid reflection // explicitly implement MarshalJSON to avoid reflection
@ -330,7 +327,7 @@ func (s *SystemInfo) MarshalJSON() ([]byte, error) {
// disk // disk
b.WriteString(`,"disks":`) b.WriteString(`,"disks":`)
if s.Disks != nil { if len(s.Disks) > 0 {
b.WriteString("{") b.WriteString("{")
first := true first := true
for device, disk := range s.Disks { for device, disk := range s.Disks {
@ -357,7 +354,7 @@ func (s *SystemInfo) MarshalJSON() ([]byte, error) {
// disks_io // disks_io
b.WriteString(`,"disks_io":`) b.WriteString(`,"disks_io":`)
if s.DisksIO != nil { if len(s.DisksIO) > 0 {
b.WriteString("{") b.WriteString("{")
first := true first := true
for name, usage := range s.DisksIO { for name, usage := range s.DisksIO {
@ -397,7 +394,7 @@ func (s *SystemInfo) MarshalJSON() ([]byte, error) {
// sensors // sensors
b.WriteString(`,"sensors":`) b.WriteString(`,"sensors":`)
if s.Sensors != nil { if len(s.Sensors) > 0 {
b.WriteString("{") b.WriteString("{")
first := true first := true
for _, sensor := range s.Sensors { for _, sensor := range s.Sensors {