make lint

dannykopping · dannykopping · commit d62d70498ffc · 2024-07-08T15:54:47.000+02:00
Signed-off-by: Danny Kopping &lt;danny@coder.com&gt;
diff --git a/coderd/notifications/manager_test.go b/coderd/notifications/manager_test.go
@@ -7,12 +7,13 @@ import (
 	"testing"
 	"time"
 
-	"github.com/coder/serpent"
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"golang.org/x/xerrors"
 
+	"github.com/coder/serpent"
+
 	"cdr.dev/slog"
 	"cdr.dev/slog/sloggers/slogtest"
 
diff --git a/coderd/notifications/metrics.go b/coderd/notifications/metrics.go
@@ -44,7 +44,7 @@ func NewMetrics(reg prometheus.Registerer) *Metrics {
 		// Aggregating on LabelTemplateID as well would cause a cardinality explosion.
 		QueuedSeconds: promauto.With(reg).NewHistogramVec(prometheus.HistogramOpts{Name: "queued_seconds", Namespace: ns, Subsystem: subsystem,
 			Buckets: []float64{0.1, 1, 5, 15, 30, 60, 120, 300, 600, 3600, 86400},
-			Help: "The difference between a notification being enqueued in the store and retrieved for processing " +
+			Help: "The time elapsed between a notification being enqueued in the store and retrieved for processing " +
 				"(measures the latency of the notifications system). This should generally be within CODER_NOTIFICATIONS_FETCH_INTERVAL " +
 				"seconds; higher values for a sustained period indicates delayed processing and CODER_NOTIFICATIONS_LEASE_COUNT " +
 				"can be increased to accommodate this.",
diff --git a/coderd/notifications/metrics_test.go b/coderd/notifications/metrics_test.go
@@ -6,16 +6,17 @@ import (
 	"testing"
 	"time"
 
-	"cdr.dev/slog"
-	"cdr.dev/slog/sloggers/slogtest"
-	"github.com/coder/serpent"
 	"github.com/prometheus/client_golang/prometheus"
 	promtest "github.com/prometheus/client_golang/prometheus/testutil"
 	dto "github.com/prometheus/client_model/go"
 	"github.com/prometheus/common/model"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
+	"cdr.dev/slog"
+	"cdr.dev/slog/sloggers/slogtest"
+	"github.com/coder/serpent"
+
 	"github.com/coder/coder/v2/coderd/database"
 	"github.com/coder/coder/v2/coderd/database/dbmem"
 	"github.com/coder/coder/v2/coderd/database/dbtestutil"
diff --git a/coderd/notifications/notifications_test.go b/coderd/notifications/notifications_test.go
@@ -14,16 +14,17 @@ import (
 	"testing"
 	"time"
 
-	"cdr.dev/slog"
-	"cdr.dev/slog/sloggers/slogtest"
-	"github.com/coder/serpent"
 	"github.com/google/uuid"
 	smtpmock "github.com/mocktools/go-smtp-mock/v2"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/goleak"
 	"golang.org/x/xerrors"
 
+	"cdr.dev/slog"
+	"cdr.dev/slog/sloggers/slogtest"
+	"github.com/coder/serpent"
+
 	"github.com/coder/coder/v2/coderd/database"
 	"github.com/coder/coder/v2/coderd/database/dbgen"
 	"github.com/coder/coder/v2/coderd/database/dbmem"
diff --git a/coderd/notifications/notifier.go b/coderd/notifications/notifier.go
@@ -257,6 +257,7 @@ func (n *notifier) newSuccessfulDispatch(msg database.AcquireNotificationMessage
 	}
 }
 
+// revive:disable-next-line:flag-parameter // Not used for control flow, rather just choosing which metric to increment.
 func (n *notifier) newFailedDispatch(msg database.AcquireNotificationMessagesRow, err error, retryable bool) dispatchResult {
 	metric := n.metrics.PermFailureCount
 

Original file line number	Diff line number	Diff line change
`@@ -257,6 +257,7 @@ func (n *notifier) newSuccessfulDispatch(msg database.AcquireNotificationMessage`
`257`	`257`	`}`
`258`	`258`	`}`
`259`	`259`
	`260`	`+// revive:disable-next-line:flag-parameter // Not used for control flow, rather just choosing which metric to increment.`
`260`	`261`	`func (n *notifier) newFailedDispatch(msg database.AcquireNotificationMessagesRow, err error, retryable bool) dispatchResult {`
`261`	`262`	`metric := n.metrics.PermFailureCount`
`262`	`263`