WIP

mtojek · mtojek · commit 8dcbafdd5ac4 · 2023-11-22T16:39:32.000+01:00
diff --git a/coderd/healthcheck/database.go b/coderd/healthcheck/database.go
@@ -35,6 +35,7 @@ type DatabaseReportOptions struct {
 
 func (r *DatabaseReport) Run(ctx context.Context, opts *DatabaseReportOptions) {
 	r.Warnings = []string{}
+	r.Severity = health.SeverityOK
 	r.ThresholdMS = opts.Threshold.Milliseconds()
 	if r.ThresholdMS == 0 {
 		r.ThresholdMS = DatabaseDefaultThreshold.Milliseconds()
@@ -49,6 +50,7 @@ func (r *DatabaseReport) Run(ctx context.Context, opts *DatabaseReportOptions) {
 		pong, err := opts.DB.Ping(ctx)
 		if err != nil {
 			r.Error = convertError(xerrors.Errorf("ping: %w", err))
+			r.Severity = health.SeverityError
 			return
 		}
 		pings = append(pings, pong)
@@ -59,8 +61,9 @@ func (r *DatabaseReport) Run(ctx context.Context, opts *DatabaseReportOptions) {
 	latency := pings[pingCount/2]
 	r.Latency = latency.String()
 	r.LatencyMS = latency.Milliseconds()
-	if r.LatencyMS < r.ThresholdMS {
-		r.Healthy = true
+	if r.LatencyMS >= r.ThresholdMS {
+		r.Severity = health.SeverityWarning
 	}
+	r.Healthy = true
 	r.Reachable = true
 }
diff --git a/coderd/healthcheck/database_test.go b/coderd/healthcheck/database_test.go
@@ -12,6 +12,7 @@ import (
 
 	"github.com/coder/coder/v2/coderd/database/dbmock"
 	"github.com/coder/coder/v2/coderd/healthcheck"
+	"github.com/coder/coder/v2/coderd/healthcheck/health"
 	"github.com/coder/coder/v2/testutil"
 )
 
@@ -35,6 +36,7 @@ func TestDatabase(t *testing.T) {
 
 		assert.True(t, report.Healthy)
 		assert.True(t, report.Reachable)
+		assert.Equal(t, health.SeverityOK, report.Severity)
 		assert.Equal(t, ping.String(), report.Latency)
 		assert.Equal(t, ping.Milliseconds(), report.LatencyMS)
 		assert.Equal(t, healthcheck.DatabaseDefaultThreshold.Milliseconds(), report.ThresholdMS)
diff --git a/coderd/healthcheck/websocket.go b/coderd/healthcheck/websocket.go
@@ -36,10 +36,12 @@ func (r *WebsocketReport) Run(ctx context.Context, opts *WebsocketReportOptions)
 	ctx, cancel := context.WithTimeout(ctx, 5*time.Second)
 	defer cancel()
 
+	r.Severity = health.SeverityOK
 	r.Warnings = []string{}
 	u, err := opts.AccessURL.Parse("/api/v2/debug/ws")
 	if err != nil {
 		r.Error = convertError(xerrors.Errorf("parse access url: %w", err))
+		r.Severity = health.SeverityError
 		return
 	}
 	if u.Scheme == "https" {
@@ -67,6 +69,7 @@ func (r *WebsocketReport) Run(ctx context.Context, opts *WebsocketReportOptions)
 	}
 	if err != nil {
 		r.Error = convertError(xerrors.Errorf("websocket dial: %w", err))
+		r.Severity = health.SeverityError
 		return
 	}
 	defer c.Close(websocket.StatusGoingAway, "goodbye")
@@ -76,22 +79,26 @@ func (r *WebsocketReport) Run(ctx context.Context, opts *WebsocketReportOptions)
 		err := c.Write(ctx, websocket.MessageText, []byte(msg))
 		if err != nil {
 			r.Error = convertError(xerrors.Errorf("write message: %w", err))
+			r.Severity = health.SeverityError
 			return
 		}
 
 		ty, got, err := c.Read(ctx)
 		if err != nil {
 			r.Error = convertError(xerrors.Errorf("read message: %w", err))
+			r.Severity = health.SeverityError
 			return
 		}
 
 		if ty != websocket.MessageText {
 			r.Error = convertError(xerrors.Errorf("received incorrect message type: %v", ty))
+			r.Severity = health.SeverityError
 			return
 		}
 
 		if string(got) != msg {
 			r.Error = convertError(xerrors.Errorf("received incorrect message: wanted %q, got %q", msg, string(got)))
+			r.Severity = health.SeverityError
 			return
 		}
 	}
diff --git a/coderd/healthcheck/websocket_test.go b/coderd/healthcheck/websocket_test.go
@@ -12,6 +12,7 @@ import (
 	"golang.org/x/xerrors"
 
 	"github.com/coder/coder/v2/coderd/healthcheck"
+	"github.com/coder/coder/v2/coderd/healthcheck/health"
 	"github.com/coder/coder/v2/testutil"
 )
 
@@ -63,6 +64,7 @@ func TestWebsocket(t *testing.T) {
 		})
 
 		require.NotNil(t, wsReport.Error)
+		require.Equal(t, health.SeverityError, wsReport.Severity)
 		assert.Equal(t, wsReport.Body, "test error")
 		assert.Equal(t, wsReport.Code, http.StatusBadRequest)
 	})

Original file line number	Diff line number	Diff line change
`@@ -36,10 +36,12 @@ func (r WebsocketReport) Run(ctx context.Context, opts WebsocketReportOptions)`
`36`	`36`	`ctx, cancel := context.WithTimeout(ctx, 5*time.Second)`
`37`	`37`	`defer cancel()`
`38`	`38`
	`39`	`+ r.Severity = health.SeverityOK`
`39`	`40`	`r.Warnings = []string{}`
`40`	`41`	`u, err := opts.AccessURL.Parse("/api/v2/debug/ws")`
`41`	`42`	`if err != nil {`
`42`	`43`	`r.Error = convertError(xerrors.Errorf("parse access url: %w", err))`
	`44`	`+ r.Severity = health.SeverityError`
`43`	`45`	`return`
`44`	`46`	`}`
`45`	`47`	`if u.Scheme == "https" {`
`@@ -67,6 +69,7 @@ func (r WebsocketReport) Run(ctx context.Context, opts WebsocketReportOptions)`
`67`	`69`	`}`
`68`	`70`	`if err != nil {`
`69`	`71`	`r.Error = convertError(xerrors.Errorf("websocket dial: %w", err))`
	`72`	`+ r.Severity = health.SeverityError`
`70`	`73`	`return`
`71`	`74`	`}`
`72`	`75`	`defer c.Close(websocket.StatusGoingAway, "goodbye")`
`@@ -76,22 +79,26 @@ func (r WebsocketReport) Run(ctx context.Context, opts WebsocketReportOptions)`
`76`	`79`	`err := c.Write(ctx, websocket.MessageText, []byte(msg))`
`77`	`80`	`if err != nil {`
`78`	`81`	`r.Error = convertError(xerrors.Errorf("write message: %w", err))`
	`82`	`+ r.Severity = health.SeverityError`
`79`	`83`	`return`
`80`	`84`	`}`
`81`	`85`
`82`	`86`	`ty, got, err := c.Read(ctx)`
`83`	`87`	`if err != nil {`
`84`	`88`	`r.Error = convertError(xerrors.Errorf("read message: %w", err))`
	`89`	`+ r.Severity = health.SeverityError`
`85`	`90`	`return`
`86`	`91`	`}`
`87`	`92`
`88`	`93`	`if ty != websocket.MessageText {`
`89`	`94`	`r.Error = convertError(xerrors.Errorf("received incorrect message type: %v", ty))`
	`95`	`+ r.Severity = health.SeverityError`
`90`	`96`	`return`
`91`	`97`	`}`
`92`	`98`
`93`	`99`	`if string(got) != msg {`
`94`	`100`	`r.Error = convertError(xerrors.Errorf("received incorrect message: wanted %q, got %q", msg, string(got)))`
	`101`	`+ r.Severity = health.SeverityError`
`95`	`102`	`return`
`96`	`103`	`}`
`97`	`104`	`}`