[OCTRL-679] O2 times and Trg times should be the correct ones for BK run details.

Author: claireguyot

core/integration/bookkeeping/api.go

@@ -27,6 +27,7 @@ package bookkeeping
 import (
 	"net/url"
 	"path"
+	"strconv"
 	"sync"
 	"time"
 
@@ -85,7 +86,7 @@ func (bk *BookkeepingWrapper) CreateRun(activityId string, nDetectors int, nEpns
 	return err
 }
 
-func (bk *BookkeepingWrapper) UpdateRun(runNumber int32, runResult string, timeO2Start time.Time, timeO2End time.Time, timeTrgStart time.Time, timeTrgEnd time.Time, trgGlobal bool, trg bool, pdpConfig string, pdpTopology string, tfbMode string /*, odcFullname string, lhcPeriod string*/) error {
+func (bk *BookkeepingWrapper) UpdateRun(runNumber int32, runResult string, timeO2Start string, timeO2End string, timeTrgStart string, timeTrgEnd string, trgGlobal bool, trg bool, pdpConfig string, pdpTopology string, tfbMode string /*, odcFullname string, lhcPeriod string*/) error {
 	var runquality sw.RunQuality
 	switch runResult {
 	case string(sw.GOOD_RunQuality):
@@ -96,20 +97,44 @@ func (bk *BookkeepingWrapper) UpdateRun(runNumber int32, runResult string, timeO
 		runquality = sw.TEST_RunQuality
 	}
 
-	timeO2S := timeO2Start.UnixMilli()
-	if (timeO2Start == time.Time{} || timeO2S < 0) {
+	timeO2S, ok := strconv.ParseInt(timeO2Start, 10, 64)
+	if ok != nil {
+		log.WithField("runNumber", runNumber).
+			WithField("time", timeO2Start).
+			Warning("cannot parse O2 start time")
 		timeO2S = -1
 	}
-	timeO2E := timeO2End.UnixMilli()
-	if (timeO2End == time.Time{} || timeO2E < 0) {
+	if timeO2Start == "" || timeO2S <= 0 {
+		timeO2S = -1
+	}
+	timeO2E, ok := strconv.ParseInt(timeO2End, 10, 64)
+	if ok != nil {
+		log.WithField("runNumber", runNumber).
+			WithField("time", timeO2End).
+			Warning("cannot parse O2 end time")
+		timeO2E = -1
+	}
+	if timeO2End == "" || timeO2E <= 0 {
 		timeO2E = -1
 	}
-	timeTrgS := timeTrgStart.UnixMilli()
-	if (timeTrgStart == time.Time{} || timeTrgS < 0) {
+	timeTrgS, ok := strconv.ParseInt(timeTrgStart, 10, 64)
+	if ok != nil {
+		log.WithField("runNumber", runNumber).
+			WithField("time", timeTrgStart).
+			Warning("cannot parse Trg start time")
 		timeTrgS = -1
 	}
-	timeTrgE := timeTrgEnd.UnixMilli()
-	if (timeTrgEnd == time.Time{} || timeTrgE < 0) {
+	if timeTrgStart == "" || timeTrgS <= 0 {
+		timeTrgS = -1
+	}
+	timeTrgE, ok := strconv.ParseInt(timeTrgEnd, 10, 64)
+	if ok != nil {
+		log.WithField("runNumber", runNumber).
+			WithField("time", timeTrgEnd).
+			Warning("cannot parse Trg end time")
+		timeTrgE = -1
+	}
+	if timeTrgEnd == "" || timeTrgE <= 0 {
 		timeTrgE = -1
 	}
 

core/integration/bookkeeping/plugin.go

@@ -296,7 +296,7 @@ func (p *Plugin) CallStack(data interface{}) (stack map[string]interface{}) {
 		}
 		return
 	}
-	updateRunFunc := func(runNumber64 int64, state string, timeO2Start time.Time, timeO2End time.Time, timeTrgStart time.Time, timeTrgEnd time.Time) (out string) {
+	updateRunFunc := func(runNumber64 int64, state string, timeO2Start string, timeO2End string, timeTrgStart string, timeTrgEnd string) (out string) {
 		callFailedStr := "Bookkeeping UpdateRun call failed"
 		trgGlobalRunEnabled, err := strconv.ParseBool(env.GetKV("", "trg_global_run_enabled"))
 		if err != nil {
@@ -344,8 +344,7 @@ func (p *Plugin) CallStack(data interface{}) (stack map[string]interface{}) {
 			return
 		} else {
 			var updatedRun string
-			emptyTime := time.Time{}
-			if timeO2Start == emptyTime {
+			if function, ok := varStack["__call_func"]; ok && function == "UpdateRunStop" {
 				updatedRun = "STOPPED"
 				delete(p.pendingRunStops, envId)
 			} else {
@@ -390,7 +389,10 @@ func (p *Plugin) CallStack(data interface{}) (stack map[string]interface{}) {
 			return
 		}
 
-		return updateRunFunc(runNumber64, "test", time.Now(), time.Time{}, time.Now(), time.Time{})
+		O2StartTime := varStack["run_start_time_ms"]
+		TrgStartTime := varStack["trg_start_time_ms"]
+
+		return updateRunFunc(runNumber64, "test", O2StartTime, "", TrgStartTime, "")
 	}
 	stack["UpdateRunStop"] = func() (out string) {
 		callFailedStr := "Bookkeeping UpdateRunStop call failed"
@@ -429,8 +431,14 @@ func (p *Plugin) CallStack(data interface{}) (stack map[string]interface{}) {
 			return
 		}
 
+		O2StartTime := varStack["run_start_time_ms"]
+		O2EndTime := varStack["run_end_time_ms"]
+
+		TrgStartTime := varStack["trg_start_time_ms"]
+		TrgEndTime := varStack["trg_end_time_ms"]
+
 		if _, ok := p.pendingRunStops[envId]; ok {
-			return updateRunFunc(runNumber64, "test", time.Time{}, time.Now(), time.Time{}, time.Now())
+			return updateRunFunc(runNumber64, "test", O2StartTime, O2EndTime, TrgStartTime, TrgEndTime)
 		} else {
 			log.WithField("partition", envId).
 				Warning("skipping UpdateRun call, no pending run number found")

core/integration/trg/plugin.go

@@ -598,6 +598,9 @@ func (p *Plugin) CallStack(data interface{}) (stack map[string]interface{}) {
 			WithField("runNumber", runNumber64).
 			Debug("TRG RunStart success")
 
+		trgStartTime := strconv.FormatInt(time.Now().UnixMilli(), 10)
+		call.GetParentRole().(callable.ParentRole).SetRuntimeVar("trg_start_time_ms", trgStartTime)
+
 		return
 	}
 	runStopFunc := func(runNumber64 int64) (out string) {
@@ -702,6 +705,9 @@ func (p *Plugin) CallStack(data interface{}) (stack map[string]interface{}) {
 			WithField("runNumber", runNumber64).
 			Debug("TRG RunStop success")
 
+		trgEndTime := strconv.FormatInt(time.Now().UnixMilli(), 10)
+		call.GetParentRole().(callable.ParentRole).SetRuntimeVar("trg_end_time_ms", trgEndTime)
+
 		return
 	}
 	runUnloadFunc := func(runNumber64 int64) (out string) {