Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions common/monitoring/metric.go
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,14 @@ const (
TIMEOUT = "timeout"
)

func (metric *Metric) AddError(err error) {
if err == nil {
metric.AddResult(SUCCESS)
} else {
metric.AddResult(ERROR)
}
}

func (metric *Metric) AddResult(result string) {
metric.AddTag("result", result)
}
Expand Down
5 changes: 5 additions & 0 deletions core/environment/environment.go
Original file line number Diff line number Diff line change
Expand Up @@ -1007,6 +1007,9 @@ func (env *Environment) TryTransition(t Transition) (err error) {
WorkflowTemplateInfo: env.GetWorkflowInfo(),
})

metric := transitionMetric(env, t.eventName(), "try")
defer monitoring.TimerSendSingle(&metric, monitoring.Millisecond)()

err = t.check()
if err != nil {
the.EventWriterWithTopic(topic.Environment).WriteEvent(&pb.Ev_EnvironmentEvent{
Expand All @@ -1020,6 +1023,7 @@ func (env *Environment) TryTransition(t Transition) (err error) {
LastRequestUser: env.GetLastRequestUser(),
WorkflowTemplateInfo: env.GetWorkflowInfo(),
})
metric.AddError(err)
return
}
err = env.Sm.Event(context.Background(), t.eventName(), t)
Expand Down Expand Up @@ -1048,6 +1052,7 @@ func (env *Environment) TryTransition(t Transition) (err error) {
WorkflowTemplateInfo: env.GetWorkflowInfo(),
})
}
metric.AddError(err)
return
}

Expand Down
5 changes: 1 addition & 4 deletions core/environment/transition.go
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,5 @@ func (t baseTransition) eventName() string {
}

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
return transitionMetric(env, t.eventName(), "do")
}
9 changes: 9 additions & 0 deletions core/environment/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ 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"
Expand Down Expand Up @@ -166,3 +167,11 @@ func HandleFailedGoError(err error, env *Environment) {
env.setState("ERROR")
}
}

func transitionMetric(env *Environment, transition string, funName string) monitoring.Metric {
metric := monitoring.NewMetric("transition")
metric.AddTag("function", funName)
metric.AddTag("transition", transition)
metric.AddTag("envId", env.Id().String())
return metric
}
Loading