fix: Ensure resourceDuration variables in metrics are always in secon…

…ds (argoproj#4411)

Signed-off-by: Simon Behar <[email protected]>

docs/variables.md

@@ -91,7 +91,7 @@ step.
 | `inputs.parameters.<NAME>` | Input parameter of the metric-emitting template |
 | `outputs.parameters.<NAME>` | Output parameter of the metric-emitting template |
 | `outputs.result` | Output result of the metric-emitting template |
-| `resourcesDuration` | Resources duration as a string. Can also be indexed for a selected resource, if available (may be one of `resourcesDuration.cpu` or `resourcesDuration.memory`. For more info, see the [Resource Duration](resource-duration.md) doc.|
+| `resourcesDuration.{cpu,memory}` | Resources duration **in seconds**. Must be one of `resourcesDuration.cpu` or `resourcesDuration.memory`, if available. For more info, see the [Resource Duration](resource-duration.md) doc.|
 
 ### Realtime Metrics
 

workflow/controller/steps.go

@@ -521,9 +521,8 @@ func (woc *wfOperationCtx) prepareMetricScope(node *wfv1.NodeStatus) (map[string
  }
 
  if node.ResourcesDuration != nil {
- localScope[common.LocalVarResourcesDuration] = node.ResourcesDuration.String()
  for name, duration := range node.ResourcesDuration {
- localScope[fmt.Sprintf("%s.%s", common.LocalVarResourcesDuration, name)] = duration.String()
+ localScope[fmt.Sprintf("%s.%s", common.LocalVarResourcesDuration, name)] = fmt.Sprint(duration.Duration().Seconds())
  }
  }
 

workflow/controller/steps_test.go

@@ -161,9 +161,7 @@ func TestResourceDurationMetric(t *testing.T) {
  err := yaml.Unmarshal([]byte(nodeStatus), &node)
  if assert.NoError(t, err) {
  localScope, _ := woc.prepareMetricScope(&node)
- assert.Contains(t, localScope["resourcesDuration"], "24s*(100Mi memory)")
- assert.Contains(t, localScope["resourcesDuration"], "33s*(1 cpu)")
- assert.Equal(t, "33s", localScope["resourcesDuration.cpu"])
- assert.Equal(t, "24s", localScope["resourcesDuration.memory"])
+ assert.Equal(t, "33", localScope["resourcesDuration.cpu"])
+ assert.Equal(t, "24", localScope["resourcesDuration.memory"])
  }
 }