diff --git a/agent/api/network_observations.go b/agent/api/network_observations.go index f7d0f585..0a78dc1a 100644 --- a/agent/api/network_observations.go +++ b/agent/api/network_observations.go @@ -94,6 +94,9 @@ func (s *Server) routeNetworkObservations(w http.ResponseWriter, r *http.Request writePreDispatchError(w, http.StatusServiceUnavailable, "network_observation_unavailable", "network observations could not be read safely") return } + if batch.Windows == nil { + batch.Windows = make([]networkobserve.Window, 0) + } writeJSON(w, http.StatusOK, batch) } diff --git a/agent/api/network_observations_test.go b/agent/api/network_observations_test.go index 8b0aa243..3cc67a4d 100644 --- a/agent/api/network_observations_test.go +++ b/agent/api/network_observations_test.go @@ -130,6 +130,29 @@ func TestNetworkObservationRouteResetsOnlyStaleGenerationCursor(t *testing.T) { } } +func TestNetworkObservationRouteEncodesEmptyWindowsAsJSONArray(t *testing.T) { + api := newTestAPI(t) + observer := &recordingNetworkObserver{ + generation: testObservationGeneration, + capability: availableObservationCapability(), + } + if err := api.handler.SetNetworkObserver(observer); err != nil { + t.Fatal(err) + } + actor := auth.Actor{UserID: 1, IsSuperAdmin: true, CanManage: true} + response := api.request(t, http.MethodGet, "/v1/network-observations", nil, actor) + if response.Code != http.StatusOK { + t.Fatalf("observation status=%d body=%s", response.Code, response.Body.String()) + } + var payload map[string]json.RawMessage + if err := json.Unmarshal(response.Body.Bytes(), &payload); err != nil { + t.Fatal(err) + } + if got := string(payload["windows"]); got != "[]" { + t.Fatalf("empty observation windows encoded as %s, want []", got) + } +} + func TestNetworkObservationQueryIsStrictAndBounded(t *testing.T) { api := newTestAPI(t) observer := &recordingNetworkObserver{