From ae037b278eba7cb1abf41bc724bf309bbead3d3e Mon Sep 17 00:00:00 2001
From: henrygd <hank@henrygd.me>
Date: Sun, 16 Aug 2026 21:15:06 -0400
Subject: [PATCH] agent: simplify FreeBSD temperature sensor names

---
 agent/sensors_freebsd_common.go      | 14 +++++++-------
 agent/sensors_freebsd_common_test.go | 10 +++++-----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/agent/sensors_freebsd_common.go b/agent/sensors_freebsd_common.go
index b6269298..503ff021 100644
--- a/agent/sensors_freebsd_common.go
+++ b/agent/sensors_freebsd_common.go
@@ -22,15 +22,15 @@ func getFreeBSDSensorTemps(ctx context.Context, readSysctl freebsdSysctlUintRead
 		return nil, err
 	}
 	temps := make([]sensors.TemperatureStat, 0, int(cpuCount)+freebsdAcpiThermalZoneCount)
-	for cpu := uint32(0); cpu < cpuCount; cpu++ {
+	for cpu := range cpuCount {
 		select {
 		case <-ctx.Done():
 			return temps, ctx.Err()
 		default:
 		}
 
-		sensorName := fmt.Sprintf("dev.cpu.%d.temperature", cpu)
-		value, err := readSysctl(sensorName)
+		sysctlName := fmt.Sprintf("dev.cpu.%d.temperature", cpu)
+		value, err := readSysctl(sysctlName)
 		if err != nil {
 			continue
 		}
@@ -39,7 +39,7 @@ func getFreeBSDSensorTemps(ctx context.Context, readSysctl freebsdSysctlUintRead
 			continue
 		}
 		temps = append(temps, sensors.TemperatureStat{
-			SensorKey:   sensorName,
+			SensorKey:   fmt.Sprintf("cpu.%d", cpu),
 			Temperature: temp,
 		})
 	}
@@ -51,8 +51,8 @@ func getFreeBSDSensorTemps(ctx context.Context, readSysctl freebsdSysctlUintRead
 		default:
 		}
 
-		sensorName := fmt.Sprintf("hw.acpi.thermal.tz%d.temperature", zone)
-		value, err := readSysctl(sensorName)
+		sysctlName := fmt.Sprintf("hw.acpi.thermal.tz%d.temperature", zone)
+		value, err := readSysctl(sysctlName)
 		if err != nil {
 			continue
 		}
@@ -61,7 +61,7 @@ func getFreeBSDSensorTemps(ctx context.Context, readSysctl freebsdSysctlUintRead
 			continue
 		}
 		temps = append(temps, sensors.TemperatureStat{
-			SensorKey:   sensorName,
+			SensorKey:   fmt.Sprintf("acpi.thermal.tz%d", zone),
 			Temperature: temp,
 		})
 	}
diff --git a/agent/sensors_freebsd_common_test.go b/agent/sensors_freebsd_common_test.go
index 3bea30ff..abac50c6 100644
--- a/agent/sensors_freebsd_common_test.go
+++ b/agent/sensors_freebsd_common_test.go
@@ -103,13 +103,13 @@ func TestGetFreeBSDSensorTemps(t *testing.T) {
 
 	require.NoError(t, err)
 	require.Len(t, temps, 4)
-	assert.Equal(t, "dev.cpu.0.temperature", temps[0].SensorKey)
+	assert.Equal(t, "cpu.0", temps[0].SensorKey)
 	assert.InDelta(t, 50.0, temps[0].Temperature, 0.001)
-	assert.Equal(t, "dev.cpu.1.temperature", temps[1].SensorKey)
+	assert.Equal(t, "cpu.1", temps[1].SensorKey)
 	assert.InDelta(t, 51.1, temps[1].Temperature, 0.001)
-	assert.Equal(t, "hw.acpi.thermal.tz0.temperature", temps[2].SensorKey)
+	assert.Equal(t, "acpi.thermal.tz0", temps[2].SensorKey)
 	assert.InDelta(t, 37.0, temps[2].Temperature, 0.001)
-	assert.Equal(t, "hw.acpi.thermal.tz2.temperature", temps[3].SensorKey)
+	assert.Equal(t, "acpi.thermal.tz2", temps[3].SensorKey)
 	assert.InDelta(t, 38.5, temps[3].Temperature, 0.001)
 }
 
@@ -149,7 +149,7 @@ func TestGetFreeBSDSensorTempsAcpiOnly(t *testing.T) {
 
 	require.NoError(t, err)
 	require.Len(t, temps, 1)
-	assert.Equal(t, "hw.acpi.thermal.tz0.temperature", temps[0].SensorKey)
+	assert.Equal(t, "acpi.thermal.tz0", temps[0].SensorKey)
 	assert.InDelta(t, 35.0, temps[0].Temperature, 0.001)
 }