Merge branch 'dk/system-notifications-o11y' of github.com:/coder/coder into dk/system-notifications-o11y

dannykopping · dannykopping · commit 54b9c5223eb3 · 2024-07-08T14:59:44.000+02:00
diff --git a/coderd/notifications/manager.go b/coderd/notifications/manager.go
@@ -63,7 +63,7 @@ func NewManager(cfg codersdk.NotificationsConfig, store Store, metrics *Metrics,
 	// TODO(dannyk): add the ability to use multiple notification methods.
 	var method database.NotificationMethod
 	if err := method.Scan(cfg.Method.String()); err != nil {
-		return nil, xerrors.Errorf("given notification method %q is invalid", cfg.Method)
+		return nil, xerrors.Errorf("notification method %q is invalid", cfg.Method)
 	}
 
 	// If dispatch timeout exceeds lease period, it is possible that messages can be delivered in duplicate because the

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ func NewManager(cfg codersdk.NotificationsConfig, store Store, metrics *Metrics,`
`63`	`63`	`// TODO(dannyk): add the ability to use multiple notification methods.`
`64`	`64`	`var method database.NotificationMethod`
`65`	`65`	`if err := method.Scan(cfg.Method.String()); err != nil {`
`66`		`- return nil, xerrors.Errorf("given notification method %q is invalid", cfg.Method)`
	`66`	`+ return nil, xerrors.Errorf("notification method %q is invalid", cfg.Method)`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`// If dispatch timeout exceeds lease period, it is possible that messages can be delivered in duplicate because the`