fix on worker metrics report

topfreegames · May 14, 2019 · 18da58b · 18da58b
1 parent 710dc12
commit 18da58b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/metrics/prometheus_reporter.go b/metrics/prometheus_reporter.go
@@ -234,8 +234,8 @@ func (p *PrometheusReporter) registerMetrics(
 		append([]string{"queue"}, additionalLabelsKeys...),
 	)
 
-	p.countReportersMap[WorkerJobsTotal] = prometheus.NewCounterVec(
-		prometheus.CounterOpts{
+	p.gaugeReportersMap[WorkerJobsTotal] = prometheus.NewGaugeVec(
+		prometheus.GaugeOpts{
 			Namespace:   "pitaya",
 			Subsystem:   "worker",
 			Name:        WorkerJobsTotal,

diff --git a/worker/report.go b/worker/report.go
@@ -44,12 +44,14 @@ func reportQueueSizes(r metrics.Reporter, queues map[string]string) {
 }
 
 func reportJobsTotal(r metrics.Reporter, failed, processed int) {
-	err := r.ReportCount(metrics.WorkerJobsTotal, map[string]string{
+	// "failed" and "processed" always grow up,
+	// so they work as count but must be reported as gauge
+	err := r.ReportGauge(metrics.WorkerJobsTotal, map[string]string{
 		"status": "failed",
 	}, float64(failed))
 	checkReportErr(metrics.WorkerJobsTotal, err)
 
-	err = r.ReportCount(metrics.WorkerJobsTotal, map[string]string{
+	err = r.ReportGauge(metrics.WorkerJobsTotal, map[string]string{
 		"status": "ok",
 	}, float64(processed))
 	checkReportErr(metrics.WorkerJobsTotal, err)

diff --git a/worker/report_test.go b/worker/report_test.go
@@ -73,12 +73,12 @@ func TestReportJobsTotal(t *testing.T) {
 	defer ctrl.Finish()
 
 	mockReporter := mocks.NewMockReporter(ctrl)
-	mockReporter.EXPECT().ReportCount(
+	mockReporter.EXPECT().ReportGauge(
 		metrics.WorkerJobsTotal,
 		map[string]string{"status": "failed"},
 		float64(10))
 
-	mockReporter.EXPECT().ReportCount(
+	mockReporter.EXPECT().ReportGauge(
 		metrics.WorkerJobsTotal,
 		map[string]string{"status": "ok"},
 		float64(20))