skip nil sensors data in grpc

This commit is contained in:
Ryan McGuire 2025-03-23 11:43:31 -04:00
parent 3b0748da25
commit 0adab13221
3 changed files with 23 additions and 16 deletions

View File

@ -1,13 +1,14 @@
# Issues
- [ ] Redis recorder panic
- [x] Redis recorder panic
# TODO
- [ ] Stop Marshaling sensors / batteries with no data
- [ ] Add json schema to CI and README
- [ ] Finish implementing weather GRPC
- [ ] Update README
- [ ] Add Grafana dashboard
## Done
- [x] Finish implementing weather GRPC
- [x] Add json schema for config
- [x] Add new spans
- [x] Helm Chart

View File

@ -1,6 +1,8 @@
package grpc
import (
"slices"
pb "gitea.libretechconsulting.com/rmcguire/ambient-local-exporter/api/v1alpha1/weather"
"gitea.libretechconsulting.com/rmcguire/ambient-local-exporter/pkg/util"
"gitea.libretechconsulting.com/rmcguire/ambient-local-exporter/pkg/weather"
@ -47,24 +49,28 @@ func UpdateToPbUpdate(u *weather.WeatherUpdate) *pb.WeatherUpdate {
}
func batteriesToPbBatteries(batteries []weather.BatteryStatus) []*pb.BatteryStatus {
pbBatteries := make([]*pb.BatteryStatus, len(batteries))
for i, b := range batteries {
pbBatteries[i] = &pb.BatteryStatus{
Component: b.Component,
Status: util.Int32ptr(b.Status),
pbBatteries := make([]*pb.BatteryStatus, 0, len(batteries))
for _, b := range batteries {
if b.Status != nil {
pbBatteries = append(pbBatteries, &pb.BatteryStatus{
Component: b.Component,
Status: util.Int32ptr(b.Status),
})
}
}
return pbBatteries
return slices.Clip(pbBatteries)
}
func thSensorsToPbSensors(sensors []*weather.TempHumiditySensor) []*pb.TempHumiditySensor {
pbSensors := make([]*pb.TempHumiditySensor, len(sensors))
for i, s := range sensors {
pbSensors[i] = &pb.TempHumiditySensor{
Name: s.Name,
TempF: s.TempF,
Humidity: util.Int32ptr(s.Humidity),
pbSensors := make([]*pb.TempHumiditySensor, 0, len(sensors))
for _, s := range sensors {
if s.TempF != nil || s.Humidity != nil {
pbSensors = append(pbSensors, &pb.TempHumiditySensor{
Name: s.Name,
TempF: s.TempF,
Humidity: util.Int32ptr(s.Humidity),
})
}
}
return pbSensors
return slices.Clip(pbSensors)
}

View File

@ -77,7 +77,7 @@ func (r *RedisRecorder) get(ctx context.Context, req *pb.GetWeatherRequest) (
Int("updatesFiltered", len(updates)-len(filtered)).
Msg("updates retrieved from redis")
return updates, err
return filtered, err
}
func jsonDatasToUpdates(datas []string) ([]*weather.WeatherUpdate, error) {