chore(retry): improve retry policy on fetcher

defelmnq · defelmnq · commit e4194319dc56 · 2024-10-18T17:30:25.000+02:00
diff --git a/coderd/notifications/fetcher.go b/coderd/notifications/fetcher.go
@@ -7,15 +7,19 @@ import (
 	"text/template"
 
 	"golang.org/x/xerrors"
+
+	"cdr.dev/slog"
 )
 
 func (n *notifier) fetchHelpers(ctx context.Context) (map[string]any, error) {
 	appName, err := n.fetchAppName(ctx)
 	if err != nil {
+		n.log.Error(ctx, "failed to fetch app name", slog.Error(err))
 		return nil, xerrors.Errorf("fetch app name: %w", err)
 	}
 	logoURL, err := n.fetchLogoURL(ctx)
 	if err != nil {
+		n.log.Error(ctx, "failed to fetch logo URL", slog.Error(err))
 		return nil, xerrors.Errorf("fetch logo URL: %w", err)
 	}
 
diff --git a/coderd/notifications/notifier.go b/coderd/notifications/notifier.go
@@ -27,6 +27,10 @@ const (
 	notificationsDefaultAppName = "Coder"
 )
 
+var (
+	errFetchfailed = xerrors.New("failed to fetch helpers")
+)
+
 // notifier is a consumer of the notifications_messages queue. It dequeues messages from that table and processes them
 // through a pipeline of fetch -> prepare -> render -> acquire handler -> deliver.
 type notifier struct {
@@ -168,7 +172,11 @@ func (n *notifier) process(ctx context.Context, success chan<- dispatchResult, f
 		deliverFn, err := n.prepare(ctx, msg)
 		if err != nil {
 			n.log.Warn(ctx, "dispatcher construction failed", slog.F("msg_id", msg.ID), slog.Error(err))
-			failure <- n.newFailedDispatch(msg, err, false)
+			if xerrors.Is(err, errFetchfailed) {
+				failure <- n.newFailedDispatch(msg, err, true)
+			} else {
+				failure <- n.newFailedDispatch(msg, err, false)
+			}
 
 			n.metrics.PendingUpdates.Set(float64(len(success) + len(failure)))
 			continue
@@ -230,7 +238,7 @@ func (n *notifier) prepare(ctx context.Context, msg database.AcquireNotification
 
 	helpers, err := n.fetchHelpers(ctx)
 	if err != nil {
-		return nil, xerrors.Errorf("fetch helpers: %w", err)
+		return nil, errFetchfailed
 	}
 
 	var title, body string

Original file line number	Diff line number	Diff line change
`@@ -7,15 +7,19 @@ import (`
`7`	`7`	`"text/template"`
`8`	`8`
`9`	`9`	`"golang.org/x/xerrors"`
	`10`	`+`
	`11`	`+ "cdr.dev/slog"`
`10`	`12`	`)`
`11`	`13`
`12`	`14`	`func (n *notifier) fetchHelpers(ctx context.Context) (map[string]any, error) {`
`13`	`15`	`appName, err := n.fetchAppName(ctx)`
`14`	`16`	`if err != nil {`
	`17`	`+ n.log.Error(ctx, "failed to fetch app name", slog.Error(err))`
`15`	`18`	`return nil, xerrors.Errorf("fetch app name: %w", err)`
`16`	`19`	`}`
`17`	`20`	`logoURL, err := n.fetchLogoURL(ctx)`
`18`	`21`	`if err != nil {`
	`22`	`+ n.log.Error(ctx, "failed to fetch logo URL", slog.Error(err))`
`19`	`23`	`return nil, xerrors.Errorf("fetch logo URL: %w", err)`
`20`	`24`	`}`
`21`	`25`