[OMON-555] Add SOR field per run (#288)

awegrzyn · web-flow · commit ac2e397ab9ce · 2022-06-13T20:09:07.000-07:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -31,7 +31,7 @@ endif()
 
 # Define project
 project(Monitoring
-  VERSION 3.12.1
+  VERSION 3.12.7
   DESCRIPTION "O2 Monitoring library"
   LANGUAGES CXX
 )
diff --git a/examples/8-KafkaToHttpServer.cxx b/examples/8-KafkaToHttpServer.cxx
@@ -177,7 +177,7 @@ void httpServer(tcp::acceptor& acceptor, tcp::socket& socket) {
         }
         auto detectorsProto = gActiveEnvs.activeruns(i).detectors();
         std::vector<std::string> detectors(detectorsProto.begin(), detectorsProto.end());
-        envsJson += "[" + std::to_string(gActiveEnvs.timestamp()) + ", \""
+        envsJson += "[" + std::to_string(gActiveEnvs.activeruns(i).enterstatetimestamp()) + ", \""
                  + gActiveEnvs.activeruns(i).environmentid() + "\", "
                  + std::to_string(gActiveEnvs.activeruns(i).runnumber()) + ", \""
                  + boost::algorithm::join(detectors, " ") + "\", \""
diff --git a/proto/envs.proto b/proto/envs.proto
@@ -18,4 +18,5 @@ message EnvInfo {
   string runType = 3;
   string state = 4;
   repeated string detectors = 5;
+  uint64 enterStateTimestamp = 6; // ms since epoch.
 }

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ endif()`
`31`	`31`
`32`	`32`	`# Define project`
`33`	`33`	`project(Monitoring`
`34`		`- VERSION 3.12.1`
	`34`	`+ VERSION 3.12.7`
`35`	`35`	`DESCRIPTION "O2 Monitoring library"`
`36`	`36`	`LANGUAGES CXX`
`37`	`37`	`)`
Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,7 @@ void httpServer(tcp::acceptor& acceptor, tcp::socket& socket) {`
`177`	`177`	`}`
`178`	`178`	`auto detectorsProto = gActiveEnvs.activeruns(i).detectors();`
`179`	`179`	`std::vector<std::string> detectors(detectorsProto.begin(), detectorsProto.end());`
`180`		`- envsJson += "[" + std::to_string(gActiveEnvs.timestamp()) + ", \""`
	`180`	`+ envsJson += "[" + std::to_string(gActiveEnvs.activeruns(i).enterstatetimestamp()) + ", \""`
`181`	`181`	`+ gActiveEnvs.activeruns(i).environmentid() + "\", "`
`182`	`182`	`+ std::to_string(gActiveEnvs.activeruns(i).runnumber()) + ", \""`
`183`	`183`	`+ boost::algorithm::join(detectors, " ") + "\", \""`
Original file line number	Diff line number	Diff line change
`@@ -18,4 +18,5 @@ message EnvInfo {`
`18`	`18`	`string runType = 3;`
`19`	`19`	`string state = 4;`
`20`	`20`	`repeated string detectors = 5;`
	`21`	`+ uint64 enterStateTimestamp = 6; // ms since epoch.`
`21`	`22`	`}`