dandri/beacon-server
1
0
Fork 0
mirror of https://github.com/MeshCore-Beacon/beacon-server.git synced 2026-10-16 18:10:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(observers): keep non-finite signal samples out of JSON

Browse Source
This commit is contained in:
n30nex
2026-09-30 07:19:02 -04:00
committed by MrAlders0n
parent 5fbba24a4a
commit 47342abc99
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/observer_metrics_integration_test.go
+5 -1
View File
@@ -3,6 +3,7 @@
package db
import (
"encoding/json"
sqlc "github.com/MeshCore-Beacon/beacon-server/db/sqlc"
"github.com/google/uuid"
"github.com/jackc/pgx/v5/pgtype"
@@ -30,7 +31,7 @@ func TestObserverMetricsPostgres(t *testing.T) {
INSERT INTO observers (id,public_key) VALUES ('00000000-0000-0000-0000-000000000001','\x01');
INSERT INTO packets(packet_hash,payload_type,last_heard_at,first_heard_at) SELECT int4send(i),4,NOW()-interval '5 days',NOW()-interval '5 days' FROM generate_series(1,3) i;
INSERT INTO packet_observations(packet_hash,observer_id,iata,heard_at,path_length_byte,hash_size,hop_count,payload_type,snr,rssi)
SELECT packet_hash,'00000000-0000-0000-0000-000000000001','YOW',date_trunc('hour',NOW())-interval '5 days',0,1,0,CASE WHEN packet_hash=int4send(1) THEN 4 END,0,-100 FROM packets;
SELECT packet_hash,'00000000-0000-0000-0000-000000000001','YOW',date_trunc('hour',NOW())-interval '5 days',0,1,0,CASE WHEN packet_hash=int4send(1) THEN 4 END,CASE WHEN packet_hash=int4send(2) THEN 'NaN'::real ELSE 0 END,-100 FROM packets;
`); err != nil {
t.Fatal(err)
}
@@ -48,6 +49,9 @@ func TestObserverMetricsPostgres(t *testing.T) {
if err != nil {
t.Fatal(err)
}
if _, err := json.Marshal(activity); err != nil {
t.Fatalf("non-finite sample leaked into JSON: %v", err)
}
if activity.Summary.RecordedPackets != 3 || len(activity.PayloadTypes) != 2 || activity.Summary.LatestRecordedAt != nil || activity.Summary.LastCompleteHour != 0 {
t.Fatalf("archive summary: %+v types=%+v", activity.Summary, activity.PayloadTypes)
}
db/observers.go
+13 -2
View File
@@ -8,6 +8,7 @@ import (
"encoding/hex"
"fmt"
"log/slog"
"math"
"time"
sqlc "github.com/MeshCore-Beacon/beacon-server/db/sqlc"
@@ -296,7 +297,12 @@ func (s *Store) GetObserverActivity(ctx context.Context, observerID uuid.UUID, w
if r.SnrN > 0 {
avg := r.SnrSum / float32(r.SnrN)
min := r.SnrMin
p.SNRAvg, p.SNRMin = &avg, &min
if !math.IsNaN(float64(avg)) && !math.IsInf(float64(avg), 0) {
p.SNRAvg = &avg
}
if !math.IsNaN(float64(min)) && !math.IsInf(float64(min), 0) {
p.SNRMin = &min
}
}
if r.RssiN > 0 {
avg := float32(r.RssiSum) / float32(r.RssiN)
@@ -346,7 +352,12 @@ func (s *Store) GetObserverActivity(ctx context.Context, observerID uuid.UUID, w
}
if r.SnrN > 0 {
avg, min := r.SnrAvg, r.SnrMin
p.SNRAvg, p.SNRMin = &avg, &min
if !math.IsNaN(float64(avg)) && !math.IsInf(float64(avg), 0) {
p.SNRAvg = &avg
}
if !math.IsNaN(float64(min)) && !math.IsInf(float64(min), 0) {
p.SNRMin = &min
}
}
if r.RssiN > 0 {
avg := r.RssiAvg