Commit15c4537

committed

Small touch-ups

Signed-off-by: Danny Kopping <danny@coder.com>

1 parent9f1d6b3 commit15c4537Copy full SHA for 15c4537

File tree

+17

-16

lines changed

+17

-16

lines changed

Lines changed: 3 additions & 4 deletions

Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

Lines changed: 4 additions & 2 deletions

Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,8 @@ FROM acquired nm`
`89`	`89`
`90`	`90`	`-- name: BulkMarkNotificationMessagesFailed :execrows`
`91`	`91`	`UPDATE notification_messages`
`92`		`-SET updated_at=subquery.failed_at,`
	`92`	`+SET queued_seconds=0,`
	`93`	`+ updated_at=subquery.failed_at,`
`93`	`94`	`attempt_count= attempt_count+1,`
`94`	`95`	`status= CASE`
`95`	`96`	`WHEN attempt_count+1< @max_attempts::int THENsubquery.status`
`@@ -107,7 +108,8 @@ WHERE notification_messages.id = subquery.id;`
`107`	`108`
`108`	`109`	`-- name: BulkMarkNotificationMessagesSent :execrows`
`109`	`110`	`UPDATE notification_messages`
`110`		`-SET updated_at=new_values.sent_at,`
	`111`	`+SET queued_seconds=0,`
	`112`	`+ updated_at=new_values.sent_at,`
`111`	`113`	`attempt_count= attempt_count+1,`
`112`	`114`	`status='sent'::notification_message_status,`
`113`	`115`	`status_reason=NULL,`

Lines changed: 6 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -92,14 +92,14 @@ func TestMetrics(t *testing.T) {`
`92`	`92`	`notifications.ResultPermFail:1,// 1 permanent failure after retries exhausted.`
`93`	`93`	`}`
`94`	`94`
`95`		`-vartarget*float64`
	`95`	`+varmatchstring`
`96`	`96`	`forresult,val:=rangeresults {`
`97`	`97`	`seriesFP:=fingerprintLabels(notifications.LabelMethod,string(method),notifications.LabelTemplateID,template.String(),notifications.LabelResult,result)`
`98`	`98`	`if!hasMatchingFingerprint(metric,seriesFP) {`
`99`	`99`	`continue`
`100`	`100`	`}`
`101`	`101`
`102`		`-target=&val`
	`102`	`+match=result`
`103`	`103`
`104`	`104`	`ifdebug {`
`105`	`105`	`t.Logf("coderd_notifications_dispatch_attempts_total{result=%q} == %v: %v",result,val,metric.Counter.GetValue())`
`@@ -109,16 +109,14 @@ func TestMetrics(t *testing.T) {`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`// Could not find a matching series.`
`112`		`-iftarget==nil {`
	`112`	`+ifmatch=="" {`
`113`	`113`	`assert.Failf(t,"found unexpected series %q",series)`
`114`	`114`	`returnfalse`
`115`	`115`	`}`
`116`	`116`
`117`		`-ifmetric.Counter.GetValue()!=*target {`
`118`		`-returnfalse`
`119`		`-}`
`120`		`-`
`121`		`-returntrue`
	`117`	`+// nolint:forcetypeassert // Already checked above.`
	`118`	`+target:=results[match]`
	`119`	`+returnmetric.Counter.GetValue()==target`
`122`	`120`	`},`
`123`	`121`	`"coderd_notifications_retry_count":func(metric*dto.Metric,seriesstring)bool {`
`124`	`122`	`assert.Truef(t,hasMatchingFingerprint(metric,methodTemplateFP),"found unexpected series %q",series)`

Comments

(0)