[core] Cache run number for bookkeeping cleanup use

Author: teo

core/environment/environment.go

@@ -293,6 +293,7 @@ func newEnvironment(userVars map[string]string) (env *Environment, err error) {
 
 				} else if e.Event == "STOP_ACTIVITY" {
 					// If the event is STOP_ACTIVITY, we remove the active run number after all hooks are done.
+					env.workflow.GetVars().Set("last_run_number", strconv.Itoa(int(env.currentRunNumber)))
 					env.currentRunNumber = 0
 					env.workflow.GetVars().Del("run_number")
 					env.workflow.GetVars().Del("runNumber")

core/integration/bookkeeping/plugin.go

@@ -1006,6 +1006,12 @@ func (p *Plugin) CallStack(data interface{}) (stack map[string]interface{}) {
 		callFailedStr := "Bookkeeping UpdateRunStop call failed"
 
 		rn := varStack["run_number"]
+		if len(rn) == 0 {
+			rn = varStack["last_run_number"]
+			log.WithField("partition", envId).
+				WithField(infologger.Run, rn).
+				Debug("run number no longer set, using last known run number for Bookkeeping UpdateRunStop")
+		}
 		runNumber64, err := strconv.ParseInt(rn, 10, 32)
 		if (strings.Contains(trigger, "DESTROY") || strings.Contains(trigger, "GO_ERROR")) && (rn == "" || runNumber64 == 0) {
 			log.WithField("partition", envId).