Add conclusion field to workflow_execution_time_seconds (#162)

Signed-off-by: Peter Halasz <peter.halasz@live.com>

internal/server/metrics.go

@@ -30,7 +30,7 @@ var (
 		Help:    "Time that a workflow took to run.",
 		Buckets: prometheus.ExponentialBuckets(1, 1.4, 30),
 	},
-		[]string{"org", "repo", "workflow_name"},
+		[]string{"org", "repo", "workflow_name", "conclusion"},
 	)
 
 	workflowRunStatusCounter = prometheus.NewCounterVec(prometheus.CounterOpts{
@@ -110,7 +110,7 @@ type WorkflowObserver interface {
 	ObserveWorkflowJobDuration(org, repo, state, runnerGroup string, seconds float64)
 	CountWorkflowJobStatus(org, repo, status, conclusion, runnerGroup string)
 	CountWorkflowJobDuration(org, repo, status, conclusion, runnerGroup string, seconds float64)
-	ObserveWorkflowRunDuration(org, repo, workflow string, seconds float64)
+	ObserveWorkflowRunDuration(org, repo, workflow, conclusion string, seconds float64)
 	CountWorkflowRunStatus(org, repo, status, conclusion, workflow string)
 }
 
@@ -131,8 +131,8 @@ func (o *PrometheusObserver) CountWorkflowJobDuration(org, repo, status, conclus
 	workflowJobDurationCounter.WithLabelValues(org, repo, status, conclusion, runnerGroup).Add(seconds)
 }
 
-func (o *PrometheusObserver) ObserveWorkflowRunDuration(org, repo, workflowName string, seconds float64) {
-	workflowRunHistogramVec.WithLabelValues(org, repo, workflowName).
+func (o *PrometheusObserver) ObserveWorkflowRunDuration(org, repo, workflowName, conclusion string, seconds float64) {
+	workflowRunHistogramVec.WithLabelValues(org, repo, workflowName, conclusion).
 		Observe(seconds)
 }
 

internal/server/workflow_metrics_exporter.go

@@ -130,14 +130,14 @@ func (c *WorkflowMetricsExporter) CollectWorkflowRunEvent(event *github.Workflow
 	repo := event.GetRepo().GetName()
 	org := event.GetRepo().GetOwner().GetLogin()
 	workflowName := event.GetWorkflow().GetName()
+	conclusion := event.GetWorkflowRun().GetConclusion()
 
 	if event.GetAction() == "completed" {
 		seconds := event.GetWorkflowRun().UpdatedAt.Time.Sub(event.GetWorkflowRun().RunStartedAt.Time).Seconds()
-		c.PrometheusObserver.ObserveWorkflowRunDuration(org, repo, workflowName, seconds)
+		c.PrometheusObserver.ObserveWorkflowRunDuration(org, repo, workflowName, conclusion, seconds)
 	}
 
 	status := event.GetWorkflowRun().GetStatus()
-	conclusion := event.GetWorkflowRun().GetConclusion()
 	c.PrometheusObserver.CountWorkflowRunStatus(org, repo, status, conclusion, workflowName)
 }
 

internal/server/workflow_metrics_exporter_test.go

@@ -208,7 +208,7 @@ func Test_GHActionExporter_HandleGHWebHook_WorkflowJobInProgressEvent(t *testing
 
 	// Then
 	assert.Equal(t, http.StatusAccepted, res.Result().StatusCode)
-	observer.assetWorkflowJobObservation(workflowJobObservation{
+	observer.assertWorkflowJobObservation(workflowJobObservation{
 		org:         org,
 		repo:        repo,
 		state:       "queued",
@@ -274,7 +274,7 @@ func Test_WorkflowMetricsExporter_HandleGHWebHook_WorkflowJobInProgressEventWith
 
 	// Then
 	assert.Equal(t, http.StatusAccepted, res.Result().StatusCode)
-	observer.assetWorkflowJobObservation(workflowJobObservation{
+	observer.assertWorkflowJobObservation(workflowJobObservation{
 		org:         org,
 		repo:        repo,
 		state:       "queued",
@@ -335,7 +335,7 @@ func Test_GHActionExporter_HandleGHWebHook_WorkflowJobCompletedEvent(t *testing.
 
 	// Then
 	assert.Equal(t, http.StatusAccepted, res.Result().StatusCode)
-	observer.assetWorkflowJobObservation(workflowJobObservation{
+	observer.assertWorkflowJobObservation(workflowJobObservation{
 		org:         org,
 		repo:        repo,
 		state:       "in_progress",
@@ -478,6 +478,8 @@ func Test_WorkflowMetricsExporter_HandleGHWebHook_WorkflowRunCompleted(t *testin
 	runStartTime := time.Unix(1650308740, 0)
 	runUpdatedTime := runStartTime.Add(time.Duration(expectedRunDuration) * time.Second)
 	status := "completed"
+	conclusion := "success"
+
 	event := github.WorkflowRunEvent{
 		Action: github.String("completed"),
 		Repo: &github.Repository{
@@ -493,6 +495,7 @@ func Test_WorkflowMetricsExporter_HandleGHWebHook_WorkflowRunCompleted(t *testin
 			Status:       &status,
 			RunStartedAt: &github.Timestamp{Time: runStartTime},
 			UpdatedAt:    &github.Timestamp{Time: runUpdatedTime},
+			Conclusion:   &conclusion,
 		},
 	}
 	req := testWebhookRequest(t, "/anything", "workflow_run", event)
@@ -503,17 +506,19 @@ func Test_WorkflowMetricsExporter_HandleGHWebHook_WorkflowRunCompleted(t *testin
 
 	// Then
 	assert.Equal(t, http.StatusAccepted, res.Result().StatusCode)
-	observer.assetWorkflowRunObservation(workflowRunObservation{
+	observer.assertWorkflowRunObservation(workflowRunObservation{
 		org:          org,
 		repo:         repo,
 		workflowName: workflowName,
+		conclusion:   conclusion,
 		seconds:      expectedRunDuration,
 	}, 50*time.Millisecond)
 	observer.assertWorkflowRunStatusCount(workflowRunStatusCount{
 		org:          org,
 		repo:         repo,
 		workflowName: workflowName,
 		status:       status,
+		conclusion:   conclusion,
 	}, 50*time.Millisecond)
 }
 
@@ -597,8 +602,8 @@ type workflowJobDurationCount struct {
 }
 
 type workflowRunObservation struct {
-	org, repo, workflowName string
-	seconds                 float64
+	org, repo, workflowName, conclusion string
+	seconds                             float64
 }
 
 type workflowRunStatusCount struct {
@@ -658,12 +663,13 @@ func (o *TestPrometheusObserver) CountWorkflowJobDuration(org, repo, status, con
 	}
 }
 
-func (o *TestPrometheusObserver) ObserveWorkflowRunDuration(org, repo, workflowName string, seconds float64) {
+func (o *TestPrometheusObserver) ObserveWorkflowRunDuration(org, repo, workflowName, conclusion string, seconds float64) {
 	o.workflowRunObserved <- workflowRunObservation{
 		org:          org,
 		repo:         repo,
 		workflowName: workflowName,
 		seconds:      seconds,
+		conclusion:   conclusion,
 	}
 }
 
@@ -685,7 +691,7 @@ func (o *TestPrometheusObserver) assertNoWorkflowJobDurationObservation(timeout
 	}
 }
 
-func (o *TestPrometheusObserver) assetWorkflowJobObservation(expected workflowJobObservation, timeout time.Duration) {
+func (o *TestPrometheusObserver) assertWorkflowJobObservation(expected workflowJobObservation, timeout time.Duration) {
 	select {
 	case <-time.After(timeout):
 		o.t.Fatal("expected observation but none occurred")
@@ -712,7 +718,7 @@ func (o *TestPrometheusObserver) assertWorkflowJobDurationCount(expected workflo
 	}
 }
 
-func (o *TestPrometheusObserver) assetWorkflowRunObservation(expected workflowRunObservation, timeout time.Duration) {
+func (o *TestPrometheusObserver) assertWorkflowRunObservation(expected workflowRunObservation, timeout time.Duration) {
 	select {
 	case <-time.After(timeout):
 		o.t.Fatal("expected observation but none occurred")