[core] use transtion name as a tag

Author: justonedev1

common/monitoring/metric.go

@@ -82,6 +82,14 @@ func (metric *Metric) AddResult(result string) {
 	metric.AddTag("result", result)
 }
 
+func (metric *Metric) ResultFromError(err error) {
+	if err == nil {
+		metric.AddResult(SUCCESS)
+	} else {
+		metric.AddResult(ERROR)
+	}
+}
+
 func (metric *Metric) setField(fieldName string, field any) {
 	if metric.fields == nil {
 		metric.fields = make(FieldsType)

core/environment/transition.go

@@ -27,7 +27,8 @@ package environment
 import (
 	"errors"
 
-	"github.com/AliceO2Group/Control/core/protos"
+	"github.com/AliceO2Group/Control/common/monitoring"
+	pb "github.com/AliceO2Group/Control/core/protos"
 	"github.com/AliceO2Group/Control/core/task"
 )
 
@@ -74,3 +75,10 @@ func (t baseTransition) check() (err error) {
 func (t baseTransition) eventName() string {
 	return t.name
 }
+
+func (t baseTransition) transitionDoMetric(env *Environment) monitoring.Metric {
+	metric := monitoring.NewMetric("transition_do")
+	metric.AddTag("transition", t.name)
+	metric.AddTag("envId", env.Id().String())
+	return metric
+}

core/environment/transition_configure.go

@@ -53,7 +53,7 @@ func (t ConfigureTransition) do(env *Environment) (err error) {
 		return errors.New("cannot transition in NIL environment")
 	}
 
-	metric := transitionMetric("configure", env)
+	metric := t.transitionDoMetric(env)
 	defer monitoring.TimerSendSingle(&metric, monitoring.Millisecond)()
 
 	wf := env.Workflow()

core/environment/transition_deploy.go

@@ -67,7 +67,7 @@ func (t DeployTransition) do(env *Environment) (err error) {
 		return errors.New("cannot transition in NIL environment")
 	}
 
-	metric := transitionMetric("deploy", env)
+	metric := t.transitionDoMetric(env)
 	defer monitoring.TimerSendSingle(&metric, monitoring.Millisecond)()
 
 	wf := env.Workflow()

core/environment/transition_goerror.go

@@ -45,7 +45,7 @@ type GoErrorTransition struct {
 }
 
 func (t GoErrorTransition) do(env *Environment) (err error) {
-	metric := transitionMetric("goerror", env)
+	metric := t.transitionDoMetric(env)
 	defer monitoring.TimerSendSingle(&metric, monitoring.Millisecond)()
 
 	// we stop all tasks which are in RUNNING

core/environment/transition_reset.go

@@ -52,7 +52,7 @@ func (t ResetTransition) do(env *Environment) (err error) {
 		return errors.New("cannot transition in NIL environment")
 	}
 
-	metric := transitionMetric("reset", env)
+	metric := t.transitionDoMetric(env)
 	defer monitoring.TimerSendSingle(&metric, monitoring.Millisecond)()
 
 	taskmanMessage := task.NewTransitionTaskMessage(

core/environment/transition_startactivity.go

@@ -73,7 +73,7 @@ func (t StartActivityTransition) do(env *Environment) (err error) {
 		return errors.New("cannot transition in NIL environment")
 	}
 
-	metric := transitionMetric("startactivity", env)
+	metric := t.transitionDoMetric(env)
 	defer monitoring.TimerSendSingle(&metric, monitoring.Millisecond)()
 
 	runNumber := env.currentRunNumber

core/environment/transition_stopactivity.go

@@ -64,7 +64,7 @@ func (t StopActivityTransition) do(env *Environment) (err error) {
 		return errors.New("cannot transition in NIL environment")
 	}
 
-	metric := transitionMetric("stopactivity", env)
+	metric := t.transitionDoMetric(env)
 	defer monitoring.TimerSendSingle(&metric, monitoring.Millisecond)()
 
 	log.WithField(infologger.Run, env.currentRunNumber).

core/environment/utils.go

@@ -33,7 +33,6 @@ import (
 	"sort"
 
 	"github.com/AliceO2Group/Control/common/logger/infologger"
-	"github.com/AliceO2Group/Control/common/monitoring"
 	pb "github.com/AliceO2Group/Control/common/protos"
 	"github.com/AliceO2Group/Control/core/task"
 	"github.com/AliceO2Group/Control/core/task/sm"
@@ -167,10 +166,3 @@ func HandleFailedGoError(err error, env *Environment) {
 		env.setState("ERROR")
 	}
 }
-
-func transitionMetric(transition string, env *Environment) monitoring.Metric {
-	metric := monitoring.NewMetric("transition_do")
-	metric.AddTag("transition", transition)
-	metric.AddTag("envId", env.Id().String())
-	return metric
-}

core/workflow/callable/call.go

@@ -253,11 +253,7 @@ func (c *Call) Start() {
 		err := c.Call()
 		select {
 		case c.await <- err:
-			if err == nil {
-				metric.AddResult(monitoring.SUCCESS)
-			} else {
-				metric.AddResult(monitoring.ERROR)
-			}
+			metric.ResultFromError(err)
 		case <-ctx.Done():
 			metric.AddResult(monitoring.CANCELLED)
 			log.Debugf("%s cancelled", callId)