Compare commits
1
Commits
v1.0.0-rc2
...
5146dc8a14
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5146dc8a14 |
@@ -199,7 +199,9 @@ stops. Its routes:
|
|||||||
address may send a limited number a minute, and the report files are capped in
|
address may send a limited number a minute, and the report files are capped in
|
||||||
size, the oldest deleted first
|
size, the oldest deleted first
|
||||||
- `GET /.well-known/healthcheck` — answers 200 with `"status":"ok"`, the
|
- `GET /.well-known/healthcheck` — answers 200 with `"status":"ok"`, the
|
||||||
server's version and its uptime
|
server's version and its uptime; while reports cannot be stored, as the last
|
||||||
|
write of a report file failed, it answers 503 with `"status":"error"` and the
|
||||||
|
same fields (see [Report storage](#report-storage))
|
||||||
- `GET /metrics` — Prometheus metrics behind basic auth, only when
|
- `GET /metrics` — Prometheus metrics behind basic auth, only when
|
||||||
`METRICS_USERNAME` and `METRICS_PASSWORD` are set; each client address may
|
`METRICS_USERNAME` and `METRICS_PASSWORD` are set; each client address may
|
||||||
make a limited number of requests to it a minute
|
make a limited number of requests to it a minute
|
||||||
@@ -274,10 +276,11 @@ The reports of a failed write stay in memory, and the next flush, within a
|
|||||||
minute, tries again to write them. The server writes one file at a time, so a
|
minute, tries again to write them. The server writes one file at a time, so a
|
||||||
file holds its reports in the order they arrived, those of a failed write
|
file holds its reports in the order they arrived, those of a failed write
|
||||||
included. From the failed write until a write succeeds, `POST /api/v1/reports`
|
included. From the failed write until a write succeeds, `POST /api/v1/reports`
|
||||||
refuses every report with 500 and keeps nothing of it. The page sends the
|
refuses every report with 500 and keeps nothing of it, and the health check
|
||||||
refused samples again in its next report, as long as it still holds them: at the
|
answers 503 with `"status":"error"`. The page sends the refused samples again in
|
||||||
1-second interval one refused report already loses some of those in the history
|
its next report, as long as it still holds them: at the 1-second interval one
|
||||||
(see [Reporting](#reporting)). Reports already answered 200 are lost only if the
|
refused report already loses some of those in the history (see
|
||||||
|
[Reporting](#reporting)). Reports already answered 200 are lost only if the
|
||||||
server stops before a write succeeds; the final flush at stop tries them too,
|
server stops before a write succeeds; the final flush at stop tries them too,
|
||||||
and if it fails, the process exits non-zero.
|
and if it fails, the process exits non-zero.
|
||||||
|
|
||||||
@@ -551,9 +554,14 @@ What the [upaas](https://git.eeqj.de/sneak/upaas) app for netwatch needs:
|
|||||||
stops the container. Empty, the backend sends nothing to Sentry
|
stops the container. Empty, the backend sends nothing to Sentry
|
||||||
- **Health check:** the image's `HEALTHCHECK` requests
|
- **Health check:** the image's `HEALTHCHECK` requests
|
||||||
`/.well-known/healthcheck` through nginx every 30 seconds, so it fails unless
|
`/.well-known/healthcheck` through nginx every 30 seconds, so it fails unless
|
||||||
both nginx and the backend answer. upaas reads the container's health 60
|
both nginx and the backend answer. It also fails while reports cannot be
|
||||||
seconds after a deploy and fails the deploy unless it is `healthy`. The
|
stored, as when the volume is full or `DATA_DIR` cannot be written: the health
|
||||||
container also stops when either process exits.
|
check answers 503 from a failed write of a report file until a write succeeds,
|
||||||
|
and the backend tries the write again every minute. Three failed checks in a
|
||||||
|
row make the container `unhealthy`, and one that passes makes it `healthy`
|
||||||
|
again. upaas reads the container's health 60 seconds after a deploy and fails
|
||||||
|
the deploy unless it is `healthy`. The container also stops when either
|
||||||
|
process exits.
|
||||||
|
|
||||||
## Browser Compatibility
|
## Browser Compatibility
|
||||||
|
|
||||||
|
|||||||
@@ -21,6 +21,15 @@ Run `make frontend-viewport-test` in CI as its own step; it is not part of
|
|||||||
|
|
||||||
# Completed Steps
|
# Completed Steps
|
||||||
|
|
||||||
|
- 2026-10-19: while report files cannot be written, the health check answers 503
|
||||||
|
with `"status":"error"` and the same fields, so the image's `HEALTHCHECK`
|
||||||
|
reports the container `unhealthy`
|
||||||
|
([#142](https://git.eeqj.de/sneak/netwatch/issues/142)). It answered 200
|
||||||
|
`"status":"ok"` whatever happened, so the platform saw a healthy container
|
||||||
|
while every report was refused with 500. It answers 200 at start, before any
|
||||||
|
write has failed, and again from the first write that succeeds. A unit test
|
||||||
|
removes `DATA_DIR` to make a write fail and checks the 503, then puts it back
|
||||||
|
and checks the 200 after the next write
|
||||||
- 2026-10-19: report file writes no longer overlap
|
- 2026-10-19: report file writes no longer overlap
|
||||||
([#150](https://git.eeqj.de/sneak/netwatch/issues/150)), so the reports of
|
([#150](https://git.eeqj.de/sneak/netwatch/issues/150)), so the reports of
|
||||||
failed writes are written in the order they arrived. Two writes that failed at
|
failed writes are written in the order they arrived. Two writes that failed at
|
||||||
|
|||||||
@@ -3,9 +3,17 @@ package handlers
|
|||||||
import "net/http"
|
import "net/http"
|
||||||
|
|
||||||
// HandleHealthCheck returns a handler for the health check
|
// HandleHealthCheck returns a handler for the health check
|
||||||
// endpoint.
|
// endpoint. It answers 200 while the status is "ok" and 503 otherwise,
|
||||||
|
// so that the image's HEALTHCHECK fails.
|
||||||
func (s *Handlers) HandleHealthCheck() http.HandlerFunc {
|
func (s *Handlers) HandleHealthCheck() http.HandlerFunc {
|
||||||
return func(w http.ResponseWriter, r *http.Request) {
|
return func(w http.ResponseWriter, r *http.Request) {
|
||||||
s.respondJSON(w, r, s.hc.Healthcheck(), http.StatusOK)
|
resp := s.hc.Healthcheck()
|
||||||
|
|
||||||
|
code := http.StatusOK
|
||||||
|
if resp.Status != "ok" {
|
||||||
|
code = http.StatusServiceUnavailable
|
||||||
|
}
|
||||||
|
|
||||||
|
s.respondJSON(w, r, resp, code)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,17 +9,19 @@ import (
|
|||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
"sneak.berlin/go/netwatch/internal/config"
|
||||||
"sneak.berlin/go/netwatch/internal/globals"
|
"sneak.berlin/go/netwatch/internal/globals"
|
||||||
"sneak.berlin/go/netwatch/internal/handlers"
|
"sneak.berlin/go/netwatch/internal/handlers"
|
||||||
"sneak.berlin/go/netwatch/internal/healthcheck"
|
"sneak.berlin/go/netwatch/internal/healthcheck"
|
||||||
"sneak.berlin/go/netwatch/internal/logger"
|
"sneak.berlin/go/netwatch/internal/logger"
|
||||||
|
"sneak.berlin/go/netwatch/internal/reportbuf"
|
||||||
|
|
||||||
"go.uber.org/fx/fxtest"
|
"go.uber.org/fx/fxtest"
|
||||||
)
|
)
|
||||||
|
|
||||||
// newStartedHandlers builds Handlers with a real health check for the
|
// newStartedHandlers builds Handlers with a real health check for the
|
||||||
// server named in g, and starts them, which records the time the
|
// server named in g, and a report buffer in a temporary directory, and
|
||||||
// uptime counts from.
|
// starts them, which records the time the uptime counts from.
|
||||||
func newStartedHandlers(t *testing.T, g *globals.Globals) *handlers.Handlers {
|
func newStartedHandlers(t *testing.T, g *globals.Globals) *handlers.Handlers {
|
||||||
t.Helper()
|
t.Helper()
|
||||||
|
|
||||||
@@ -30,14 +32,23 @@ func newStartedHandlers(t *testing.T, g *globals.Globals) *handlers.Handlers {
|
|||||||
t.Fatalf("logger: %v", err)
|
t.Fatalf("logger: %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
buf, err := reportbuf.New(lc, reportbuf.Params{
|
||||||
|
Config: &config.Config{DataDir: t.TempDir(), DataDirMaxBytes: 1 << 20},
|
||||||
|
Logger: log,
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("report buffer: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
hc, err := healthcheck.New(lc,
|
hc, err := healthcheck.New(lc,
|
||||||
healthcheck.Params{Globals: g, Logger: log})
|
healthcheck.Params{Buffer: buf, Globals: g, Logger: log})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("health check: %v", err)
|
t.Fatalf("health check: %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
h, err := handlers.New(lc,
|
h, err := handlers.New(lc, handlers.Params{
|
||||||
handlers.Params{Globals: g, Healthcheck: hc, Logger: log})
|
Buffer: buf, Globals: g, Healthcheck: hc, Logger: log,
|
||||||
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("handlers: %v", err)
|
t.Fatalf("handlers: %v", err)
|
||||||
}
|
}
|
||||||
@@ -48,10 +59,12 @@ func newStartedHandlers(t *testing.T, g *globals.Globals) *handlers.Handlers {
|
|||||||
return h
|
return h
|
||||||
}
|
}
|
||||||
|
|
||||||
// TestHandleHealthCheck checks the health check's answer: 200, a JSON
|
// TestHandleHealthCheck checks the health check's answer at start, when
|
||||||
// content type, and a JSON object with exactly the fields of
|
// no write of a report file has failed: 200, a JSON content type, and a
|
||||||
// healthcheck.HealthcheckResponse, carrying this server's name and
|
// JSON object with exactly the fields of healthcheck.HealthcheckResponse,
|
||||||
// version and an uptime counted from its start.
|
// carrying "status":"ok", this server's name and version and an uptime
|
||||||
|
// counted from its start. The answer while writes fail is checked in
|
||||||
|
// internal/reportbuf, whose tests can make a write fail.
|
||||||
func TestHandleHealthCheck(t *testing.T) {
|
func TestHandleHealthCheck(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
|
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ import (
|
|||||||
"sneak.berlin/go/netwatch/internal/config"
|
"sneak.berlin/go/netwatch/internal/config"
|
||||||
"sneak.berlin/go/netwatch/internal/globals"
|
"sneak.berlin/go/netwatch/internal/globals"
|
||||||
"sneak.berlin/go/netwatch/internal/logger"
|
"sneak.berlin/go/netwatch/internal/logger"
|
||||||
|
"sneak.berlin/go/netwatch/internal/reportbuf"
|
||||||
|
|
||||||
"go.uber.org/fx"
|
"go.uber.org/fx"
|
||||||
)
|
)
|
||||||
@@ -18,6 +19,7 @@ import (
|
|||||||
type Params struct {
|
type Params struct {
|
||||||
fx.In
|
fx.In
|
||||||
|
|
||||||
|
Buffer *reportbuf.Buffer
|
||||||
Config *config.Config
|
Config *config.Config
|
||||||
Globals *globals.Globals
|
Globals *globals.Globals
|
||||||
Logger *logger.Logger
|
Logger *logger.Logger
|
||||||
@@ -68,12 +70,18 @@ func New(
|
|||||||
return s, nil
|
return s, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// Healthcheck returns the current health status of the application.
|
// Healthcheck returns the current health status of the application:
|
||||||
|
// "ok", or "error" while report files cannot be written.
|
||||||
func (s *Healthcheck) Healthcheck() *HealthcheckResponse {
|
func (s *Healthcheck) Healthcheck() *HealthcheckResponse {
|
||||||
|
status := "ok"
|
||||||
|
if s.params.Buffer.LastWriteFailed() {
|
||||||
|
status = "error"
|
||||||
|
}
|
||||||
|
|
||||||
return &HealthcheckResponse{
|
return &HealthcheckResponse{
|
||||||
Appname: s.params.Globals.Appname,
|
Appname: s.params.Globals.Appname,
|
||||||
Now: time.Now().UTC().Format(time.RFC3339Nano),
|
Now: time.Now().UTC().Format(time.RFC3339Nano),
|
||||||
Status: "ok",
|
Status: status,
|
||||||
UptimeHuman: s.uptime().String(),
|
UptimeHuman: s.uptime().String(),
|
||||||
UptimeSeconds: int64(s.uptime().Seconds()),
|
UptimeSeconds: int64(s.uptime().Seconds()),
|
||||||
Version: s.params.Globals.Version,
|
Version: s.params.Globals.Version,
|
||||||
|
|||||||
@@ -255,6 +255,16 @@ func (b *Buffer) Append(v any) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// LastWriteFailed reports whether the last write of a report file to
|
||||||
|
// finish failed: false at start until a write fails, and false again
|
||||||
|
// once a write succeeds. While it is true, Append refuses reports.
|
||||||
|
func (b *Buffer) LastWriteFailed() bool {
|
||||||
|
b.mu.Lock()
|
||||||
|
defer b.mu.Unlock()
|
||||||
|
|
||||||
|
return b.writeErr != nil
|
||||||
|
}
|
||||||
|
|
||||||
// deleteOldestFiles deletes report files, oldest first, until n more
|
// deleteOldestFiles deletes report files, oldest first, until n more
|
||||||
// bytes fit under maxBytes. It deletes none when the reports waiting
|
// bytes fit under maxBytes. It deletes none when the reports waiting
|
||||||
// to be written leave no room for n even with every file gone, since
|
// to be written leave no room for n even with every file gone, since
|
||||||
|
|||||||
@@ -1074,6 +1074,51 @@ func TestReportsRefusedWhileWritesFail(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TestHealthCheckFailsWhileWritesFail asks the health check handler
|
||||||
|
// for its answer around a failed write. It answers 200 with
|
||||||
|
// "status":"ok" at start, 503 with "status":"error" from the failed
|
||||||
|
// write until a write succeeds, and 200 with "status":"ok" again after.
|
||||||
|
func TestHealthCheckFailsWhileWritesFail(t *testing.T) {
|
||||||
|
dir := t.TempDir()
|
||||||
|
t.Setenv("DATA_DIR", dir)
|
||||||
|
|
||||||
|
buf, h := startBufferWithHandlers(t)
|
||||||
|
|
||||||
|
checkHealthCheck(t, h, "at start", http.StatusOK, "ok")
|
||||||
|
|
||||||
|
// A flush writes a file only when a report is waiting.
|
||||||
|
err := buf.Append(map[string]string{"id": "kept"})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("append: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// With the data directory gone, the write has nowhere to go.
|
||||||
|
err = os.Remove(dir)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("remove data dir: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
err = buf.Flush()
|
||||||
|
if err == nil {
|
||||||
|
t.Fatal("flush succeeded with the data directory gone")
|
||||||
|
}
|
||||||
|
|
||||||
|
checkHealthCheck(t, h, "after the failed write",
|
||||||
|
http.StatusServiceUnavailable, "error")
|
||||||
|
|
||||||
|
err = os.Mkdir(dir, 0o750)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("make data dir: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
err = buf.Flush()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("flush with the data directory back: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
checkHealthCheck(t, h, "after a write succeeded", http.StatusOK, "ok")
|
||||||
|
}
|
||||||
|
|
||||||
// startBufferWithHandlers starts a Buffer and the Handlers that store
|
// startBufferWithHandlers starts a Buffer and the Handlers that store
|
||||||
// reports in it through fx, as main does, with the DATA_DIR the calling
|
// reports in it through fx, as main does, with the DATA_DIR the calling
|
||||||
// test has set.
|
// test has set.
|
||||||
@@ -1121,6 +1166,39 @@ func postReport(t *testing.T, h *handlers.Handlers, clientID string) int {
|
|||||||
return rec.Code
|
return rec.Code
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// checkHealthCheck asks the health check handler for its answer, and
|
||||||
|
// fails the test, saying when it asked, unless the answer has status
|
||||||
|
// code wantCode and a "status" field of wantStatus.
|
||||||
|
func checkHealthCheck(
|
||||||
|
t *testing.T,
|
||||||
|
h *handlers.Handlers,
|
||||||
|
when string,
|
||||||
|
wantCode int,
|
||||||
|
wantStatus string,
|
||||||
|
) {
|
||||||
|
t.Helper()
|
||||||
|
|
||||||
|
rec := httptest.NewRecorder()
|
||||||
|
req := httptest.NewRequestWithContext(t.Context(),
|
||||||
|
http.MethodGet, "/.well-known/healthcheck", http.NoBody)
|
||||||
|
h.HandleHealthCheck().ServeHTTP(rec, req)
|
||||||
|
|
||||||
|
var body struct {
|
||||||
|
Status string `json:"status"`
|
||||||
|
}
|
||||||
|
|
||||||
|
err := json.Unmarshal(rec.Body.Bytes(), &body)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("health check %s: body not JSON: %v (%q)",
|
||||||
|
when, err, rec.Body.String())
|
||||||
|
}
|
||||||
|
|
||||||
|
if rec.Code != wantCode || body.Status != wantStatus {
|
||||||
|
t.Fatalf("health check %s: %d with status %q, want %d with %q",
|
||||||
|
when, rec.Code, body.Status, wantCode, wantStatus)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// TestConcurrentAppendsStopAtCap appends from many goroutines at once
|
// TestConcurrentAppendsStopAtCap appends from many goroutines at once
|
||||||
// with room for exactly roomFor reports: exactly that many must be
|
// with room for exactly roomFor reports: exactly that many must be
|
||||||
// taken, which holds only if Append checks and counts each report
|
// taken, which holds only if Append checks and counts each report
|
||||||
|
|||||||
Reference in New Issue
Block a user