refactor: refactor metric handling by removing IncCompletedTask method

appleboy · appleboy · commit 013bf955210d · 2025-01-25T13:05:27.000+08:00
- Remove `IncCompletedTask` method from `Metric` interface
- Remove `completedTasks` field from `metric` struct
- Remove `IncCompletedTask` method implementation
- Update `CompletedTasks` method to return the sum of `successTasks` and `failureTasks`
- Remove call to `IncCompletedTask` in `Queue`'s `work` method

Signed-off-by: appleboy &lt;appleboy.tw@gmail.com&gt;
diff --git a/metric.go b/metric.go
@@ -14,7 +14,6 @@ type Metric interface {
 	IncSuccessTask()
 	IncFailureTask()
 	IncSubmittedTask()
-	IncCompletedTask()
 }
 
 var _ Metric = (*metric)(nil)
@@ -24,7 +23,6 @@ type metric struct {
 	successTasks   uint64
 	failureTasks   uint64
 	submittedTasks uint64
-	completedTasks uint64
 }
 
 // NewMetric for default metric structure
@@ -56,10 +54,6 @@ func (m *metric) IncSubmittedTask() {
 	atomic.AddUint64(&m.submittedTasks, 1)
 }
 
-func (m *metric) IncCompletedTask() {
-	atomic.AddUint64(&m.completedTasks, 1)
-}
-
 func (m *metric) SuccessTasks() uint64 {
 	return atomic.LoadUint64(&m.successTasks)
 }
@@ -73,5 +67,5 @@ func (m *metric) SubmittedTasks() uint64 {
 }
 
 func (m *metric) CompletedTasks() uint64 {
-	return atomic.LoadUint64(&m.completedTasks)
+	return atomic.LoadUint64(&m.successTasks) + atomic.LoadUint64(&m.failureTasks)
 }
diff --git a/queue.go b/queue.go
@@ -172,7 +172,6 @@ func (q *Queue) work(task core.TaskMessage) {
 		if q.afterFn != nil {
 			q.afterFn()
 		}
-		q.metric.IncCompletedTask()
 	}()
 
 	if err = q.run(task); err != nil {

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,6 @@ type Metric interface {`
`14`	`14`	`IncSuccessTask()`
`15`	`15`	`IncFailureTask()`
`16`	`16`	`IncSubmittedTask()`
`17`		`- IncCompletedTask()`
`18`	`17`	`}`
`19`	`18`
`20`	`19`	`var _ Metric = (*metric)(nil)`
`@@ -24,7 +23,6 @@ type metric struct {`
`24`	`23`	`successTasks uint64`
`25`	`24`	`failureTasks uint64`
`26`	`25`	`submittedTasks uint64`
`27`		`- completedTasks uint64`
`28`	`26`	`}`
`29`	`27`
`30`	`28`	`// NewMetric for default metric structure`
`@@ -56,10 +54,6 @@ func (m *metric) IncSubmittedTask() {`
`56`	`54`	`atomic.AddUint64(&m.submittedTasks, 1)`
`57`	`55`	`}`
`58`	`56`
`59`		`-func (m *metric) IncCompletedTask() {`
`60`		`- atomic.AddUint64(&m.completedTasks, 1)`
`61`		`-}`
`62`		`-`
`63`	`57`	`func (m *metric) SuccessTasks() uint64 {`
`64`	`58`	`return atomic.LoadUint64(&m.successTasks)`
`65`	`59`	`}`
`@@ -73,5 +67,5 @@ func (m *metric) SubmittedTasks() uint64 {`
`73`	`67`	`}`
`74`	`68`
`75`	`69`	`func (m *metric) CompletedTasks() uint64 {`
`76`		`- return atomic.LoadUint64(&m.completedTasks)`
	`70`	`+ return atomic.LoadUint64(&m.successTasks) + atomic.LoadUint64(&m.failureTasks)`
`77`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,6 @@ func (q *Queue) work(task core.TaskMessage) {`
`172`	`172`	`if q.afterFn != nil {`
`173`	`173`	`q.afterFn()`
`174`	`174`	`}`
`175`		`- q.metric.IncCompletedTask()`
`176`	`175`	`}()`
`177`	`176`
`178`	`177`	`if err = q.run(task); err != nil {`