[QC-679] Set the run number and the partition in the infologger

Framework/include/QualityControl/QcInfoLogger.h

@@ -53,13 +53,19 @@ class QcInfoLogger : public AliceO2::InfoLogger::InfoLogger
 
   void setFacility(const std::string& facility);
   void setDetector(const std::string& detector);
+  void setRun(int run);
+  void setPartition(std::string& partitionName);
   void init(const std::string& facility,
             bool discardDebug = false,
             int discardFromLevel = 21 /* Discard Trace */,
-            AliceO2::InfoLogger::InfoLoggerContext* dplContext = nullptr);
+            AliceO2::InfoLogger::InfoLoggerContext* dplContext = nullptr,
+            int run = -1,
+            std::string partitionName = "");
   void init(const std::string& facility,
             const boost::property_tree::ptree& config,
-            AliceO2::InfoLogger::InfoLoggerContext* dplContext = nullptr);
+            AliceO2::InfoLogger::InfoLoggerContext* dplContext = nullptr,
+            int run = -1,
+            std::string partitionName = "");
 
  private:
   QcInfoLogger();

Framework/include/QualityControl/runnerUtils.h

@@ -82,6 +82,16 @@ inline int computeRunNumber(const framework::ServiceRegistry& services, int fall
   return run;
 }
 
+inline std::string computePartitionName(const framework::ServiceRegistry& services, const std::string& fallbackPartitionName = "")
+{
+  std::string partitionName;
+  partitionName = services.get<framework::RawDeviceService>().device()->fConfig->GetProperty<std::string>("environment_id", "unspecified");
+  ILOG(Info, Devel) << "Got this property partitionName from RawDeviceService: '" << partitionName << "'" << ENDM;
+  partitionName = partitionName != "unspecified" /* found it in service */ ? partitionName : fallbackPartitionName;
+  ILOG(Debug, Devel) << "Period Name returned by computePeriodName : " << partitionName << ENDM;
+  return partitionName;
+}
+
 inline std::string computePeriodName(const framework::ServiceRegistry& services, const std::string& fallbackPeriodName = "")
 { // Determine period
   std::string periodName;

Framework/src/AggregatorRunner.cxx

@@ -322,6 +322,9 @@ void AggregatorRunner::start(const ServiceRegistry& services)
   mActivity.mPeriodName = computePeriodName(services, mRunnerConfig.fallbackPeriodName);
   mActivity.mPassName = computePassName(mRunnerConfig.fallbackPassName);
   mActivity.mProvenance = computeProvenance(mRunnerConfig.fallbackProvenance);
+  string partitionName = computePartitionName(services);
+  ILOG_INST.setRun(mActivity.mId);
+  ILOG_INST.setPartition(partitionName);
   ILOG(Info, Ops) << "Starting run " << mActivity.mId << ":"
                   << "\n   - period: " << mActivity.mPeriodName << "\n   - pass type: " << mActivity.mPassName << "\n   - provenance: " << mActivity.mProvenance << ENDM;
 }

Framework/src/CheckRunner.cxx

@@ -423,6 +423,9 @@ void CheckRunner::start(const ServiceRegistry& services)
   mActivity.mPeriodName = computePeriodName(services, mConfig.fallbackPeriodName);
   mActivity.mPassName = computePassName(mConfig.fallbackPassName);
   mActivity.mProvenance = computeProvenance(mConfig.fallbackProvenance);
+  string partitionName = computePartitionName(services);
+  ILOG_INST.setRun(mActivity.mId);
+  ILOG_INST.setPartition(partitionName);
   ILOG(Info, Ops) << "Starting run " << mActivity.mId << ":"
                   << "\n   - period: " << mActivity.mPeriodName << "\n   - pass type: " << mActivity.mPassName << "\n   - provenance: " << mActivity.mProvenance << ENDM;
   mTimerTotalDurationActivity.reset();

Framework/src/QcInfoLogger.cxx

@@ -50,11 +50,37 @@ void QcInfoLogger::setDetector(const std::string& detector)
   ILOG(Debug, Support) << "Detector set to " << detector << ENDM;
 }
 
+void QcInfoLogger::setRun(int run)
+{
+  if (run > 0) {
+    mContext->setField(infoContext::FieldName::Run, std::to_string(run));
+    if (mDplContext) {
+      mDplContext->setField(infoContext::FieldName::Run, std::to_string(run));
+    }
+  }
+  this->setContext(*mContext);
+  ILOG(Debug, Support) << "IL: Run set to " << run << ENDM;
+}
+
+void QcInfoLogger::setPartition(std::string& partitionName)
+{
+  mContext->setField(infoContext::FieldName::Partition, partitionName);
+  if (mDplContext) {
+    mDplContext->setField(infoContext::FieldName::Partition, partitionName);
+  }
+  this->setContext(*mContext);
+  ILOG(Debug, Support) << "IL: Partition set to " << partitionName << ENDM;
+}
+
 void QcInfoLogger::init(const std::string& facility, bool discardDebug, int discardFromLevel,
-                        AliceO2::InfoLogger::InfoLoggerContext* dplContext)
+                        AliceO2::InfoLogger::InfoLoggerContext* dplContext,
+                        int run,
+                        std::string partitionName)
 {
   mDplContext = dplContext;
   setFacility(facility);
+  setRun(run);
+  setPartition(partitionName);
 
   // Set the proper discard filters
   ILOG_INST.filterDiscardDebug(discardDebug);
@@ -66,12 +92,14 @@ void QcInfoLogger::init(const std::string& facility, bool discardDebug, int disc
 }
 
 void QcInfoLogger::init(const std::string& facility, const boost::property_tree::ptree& config,
-                        AliceO2::InfoLogger::InfoLoggerContext* dplContext)
+                        AliceO2::InfoLogger::InfoLoggerContext* dplContext,
+                        int run,
+                        std::string partitionName)
 {
   std::string discardDebugStr = config.get<std::string>("qc.config.infologger.filterDiscardDebug", "false");
   bool discardDebug = discardDebugStr == "true" ? 1 : 0;
   int discardLevel = config.get<int>("qc.config.infologger.filterDiscardLevel", 21 /* Discard Trace */);
-  init(facility, discardDebug, discardLevel, dplContext);
+  init(facility, discardDebug, discardLevel, dplContext, run, partitionName);
 }
 
 } // namespace o2::quality_control::core

Framework/src/TaskRunner.cxx

@@ -208,6 +208,9 @@ void TaskRunner::endOfStream(framework::EndOfStreamContext& eosContext)
 void TaskRunner::start(const ServiceRegistry& services)
 {
   mRunNumber = o2::quality_control::core::computeRunNumber(services, mTaskConfig.fallbackRunNumber);
+  ILOG_INST.setRun(mRunNumber);
+  string partitionName = computePartitionName(services);
+  ILOG_INST.setPartition(partitionName);
 
   try {
     startOfActivity();