fix: Use correct template when processing metrics (argoproj#4399)

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

workflow/controller/operator.go

@@ -1553,13 +1553,13 @@ func (woc *wfOperationCtx) executeTemplate(nodeName string, orgTmpl wfv1.Templat
  woc.controller.syncManager.Release(woc.wf, node.ID, processedTmpl.Synchronization)
  }
  woc.log.Debugf("Node %s already completed", nodeName)
- if resolvedTmpl.Metrics != nil {
+ if processedTmpl.Metrics != nil {
  // Check if this node completed between executions. If it did, emit metrics. If a node completes within
  // the same execution, its metrics are emitted below.
  // We can infer that this node completed during the current operation, emit metrics
  if prevNodeStatus, ok := woc.preExecutionNodePhases[node.ID]; ok && !prevNodeStatus.Fulfilled() {
  localScope, realTimeScope := woc.prepareMetricScope(node)
- woc.computeMetrics(resolvedTmpl.Metrics.Prometheus, localScope, realTimeScope, false)
+ woc.computeMetrics(processedTmpl.Metrics.Prometheus, localScope, realTimeScope, false)
  }
  }
  return node, nil
@@ -1643,14 +1643,14 @@ func (woc *wfOperationCtx) executeTemplate(nodeName string, orgTmpl wfv1.Templat
  retryParentNode = processedRetryParentNode
  // The retry node might have completed by now.
  if retryParentNode.Fulfilled() {
- if resolvedTmpl.Metrics != nil {
+ if processedTmpl.Metrics != nil {
  // In this check, a completed node may or may not have existed prior to this execution. If it did exist, ensure that it wasn't
  // completed before this execution. If it did not exist prior, then we can infer that it was completed during this execution.
  // The statement "(!ok || !prevNodeStatus.Fulfilled())" checks for this behavior and represents the material conditional
  // "ok -> !prevNodeStatus.Fulfilled()" (https://en.wikipedia.org/wiki/Material_conditional)
  if prevNodeStatus, ok := woc.preExecutionNodePhases[retryParentNode.ID]; (!ok || !prevNodeStatus.Fulfilled()) && retryParentNode.Fulfilled() {
  localScope, realTimeScope := woc.prepareMetricScope(node)
- woc.computeMetrics(resolvedTmpl.Metrics.Prometheus, localScope, realTimeScope, false)
+ woc.computeMetrics(processedTmpl.Metrics.Prometheus, localScope, realTimeScope, false)
  }
  }
  return retryParentNode, nil
@@ -1715,12 +1715,12 @@ func (woc *wfOperationCtx) executeTemplate(nodeName string, orgTmpl wfv1.Templat
  }
  }
 
- if resolvedTmpl.Metrics != nil {
+ if processedTmpl.Metrics != nil {
  // Check if the node was just created, if it was emit realtime metrics.
  // If the node did not previously exist, we can infer that it was created during the current operation, emit real time metrics.
  if _, ok := woc.preExecutionNodePhases[node.ID]; !ok {
  localScope, realTimeScope := woc.prepareMetricScope(node)
- woc.computeMetrics(resolvedTmpl.Metrics.Prometheus, localScope, realTimeScope, true)
+ woc.computeMetrics(processedTmpl.Metrics.Prometheus, localScope, realTimeScope, true)
  }
  // Check if the node completed during this execution, if it did emit metrics
  //
@@ -1734,7 +1734,7 @@ func (woc *wfOperationCtx) executeTemplate(nodeName string, orgTmpl wfv1.Templat
  // "ok -> !prevNodeStatus.Fulfilled()" (https://en.wikipedia.org/wiki/Material_conditional)
  if prevNodeStatus, ok := woc.preExecutionNodePhases[node.ID]; (!ok || !prevNodeStatus.Fulfilled()) && node.Fulfilled() {
  localScope, realTimeScope := woc.prepareMetricScope(node)
- woc.computeMetrics(resolvedTmpl.Metrics.Prometheus, localScope, realTimeScope, false)
+ woc.computeMetrics(processedTmpl.Metrics.Prometheus, localScope, realTimeScope, false)
  }
  }