add userCodeName and dataSources to UserCodeConfig

userCodeName being the task/check/aggregator/... name set by users

Author: knopers8

Framework/include/QualityControl/AggregatorConfig.h

@@ -31,7 +31,6 @@ namespace o2::quality_control::checker
 
 /// \brief  Container for the configuration of an Aggregator.
 struct AggregatorConfig : public o2::quality_control::core::UserCodeConfig {
-  std::string name;
   UpdatePolicyType policyType = UpdatePolicyType::OnAny;
   std::vector<std::string> objectNames{}; // fixme: if object names are empty, allObjects are true, consider reducing to one var // fixme: duplicates "sources"
   bool allObjects = false;

Framework/include/QualityControl/CheckConfig.h

@@ -29,7 +29,6 @@ namespace o2::quality_control::checker
 
 /// \brief  Container for the configuration of a Check.
 struct CheckConfig : public o2::quality_control::core::UserCodeConfig {
-  std::string name;
   UpdatePolicyType policyType = UpdatePolicyType::OnAny;
   std::vector<std::string> objectNames{}; // fixme: if object names are empty, allObjects are true, consider reducing to one var
   bool allObjects = false;

Framework/include/QualityControl/LateTaskFactory.h

@@ -33,7 +33,7 @@ class LateTaskFactory
   static LateTaskInterface* create(const LateTaskRunnerConfig& taskConfig, std::shared_ptr<ObjectsManager> objectsManager)
   {
     auto* result = root_class_factory::create<LateTaskInterface>(taskConfig.moduleName, taskConfig.className);
-    result->setName(taskConfig.taskName);
+    result->setName(taskConfig.name);
     result->setObjectsManager(objectsManager);
     result->setCustomParameters(taskConfig.customParameters);
     result->setCcdbUrl(taskConfig.ccdbUrl);

Framework/include/QualityControl/TaskRunnerConfig.h

@@ -42,7 +42,6 @@ namespace o2::quality_control::core
 /// \brief  Container for the configuration of a Task
 struct TaskRunnerConfig : public UserCodeConfig {
   std::string deviceName;
-  std::string taskName;
   std::vector<std::pair<size_t, size_t>> cycleDurations = {};
   int maxNumberCycles;
   bool critical;

Framework/include/QualityControl/UserCodeConfig.h

@@ -19,19 +19,22 @@
 
 #include "QualityControl/CustomParameters.h"
 #include "QualityControl/stringUtils.h"
+#include "QualityControl/DataSourceSpec.h"
 
 namespace o2::quality_control::core
 {
 
 /// \brief  Container for the configuration of a Task
 struct UserCodeConfig {
+  std::string name; // task name, check name, etc...
   std::string moduleName;
   std::string className;
   std::string detectorName = "MISC"; // intended to be the 3 letters code;
   std::string consulUrl;
   CustomParameters customParameters;
   std::string ccdbUrl;
   std::unordered_map<std::string, std::string> repository; // we need the full config of the database to build the database in the subclasses
+  std::vector<DataSourceSpec> dataSources;
 };
 
 } // namespace o2::quality_control::core

Framework/src/Aggregator.cxx

@@ -240,14 +240,15 @@ AggregatorConfig Aggregator::extractConfig(const core::CommonSpec& commonSpec, c
   }
 
   return {
+    aggregatorSpec.aggregatorName,
     aggregatorSpec.moduleName,
     aggregatorSpec.className,
     aggregatorSpec.detectorName,
     commonSpec.consulUrl,
     aggregatorSpec.customParameters,
     commonSpec.conditionDBUrl,
     commonSpec.database,
-    aggregatorSpec.aggregatorName,
+    aggregatorSpec.dataSources,
     updatePolicy,
     std::move(objectNames),
     checkAllObjects,

Framework/src/Check.cxx

@@ -267,14 +267,15 @@ CheckConfig Check::extractConfig(const CommonSpec& commonSpec, const CheckSpec&
   }
 
   return {
+    checkSpec.checkName,
     checkSpec.moduleName,
     checkSpec.className,
     checkSpec.detectorName,
     commonSpec.consulUrl,
     checkSpec.customParameters,
     commonSpec.conditionDBUrl,
     commonSpec.database,
-    checkSpec.checkName,
+    checkSpec.dataSources,
     updatePolicy,
     std::move(objectNames),
     checkAllObjects,

Framework/src/TaskFactory.cxx

@@ -24,7 +24,7 @@ namespace o2::quality_control::core
 TaskInterface* TaskFactory::create(const TaskRunnerConfig& taskConfig, std::shared_ptr<ObjectsManager> objectsManager)
 {
   auto* result = root_class_factory::create<TaskInterface>(taskConfig.moduleName, taskConfig.className);
-  result->setName(taskConfig.taskName);
+  result->setName(taskConfig.name);
   result->setObjectsManager(objectsManager);
   result->setCustomParameters(taskConfig.customParameters);
   result->setCcdbUrl(taskConfig.ccdbUrl);

Framework/src/TaskRunner.cxx

@@ -85,7 +85,7 @@ TaskRunner::~TaskRunner()
 
 void TaskRunner::init(InitContext& iCtx)
 {
-  core::initInfologger(iCtx, mTaskConfig.infologgerDiscardParameters, "task/" + mTaskConfig.taskName, mTaskConfig.detectorName);
+  core::initInfologger(iCtx, mTaskConfig.infologgerDiscardParameters, "task/" + mTaskConfig.name, mTaskConfig.detectorName);
   ILOG(Info, Devel) << "Initializing TaskRunner" << ENDM;
 
   printTaskConfig();
@@ -103,11 +103,11 @@ void TaskRunner::init(InitContext& iCtx)
   // setup monitoring
   mCollector = MonitoringFactory::Get(mTaskConfig.monitoringUrl);
   mCollector->addGlobalTag(tags::Key::Subsystem, tags::Value::QC);
-  mCollector->addGlobalTag("TaskName", mTaskConfig.taskName);
+  mCollector->addGlobalTag("TaskName", mTaskConfig.name);
   mCollector->addGlobalTag("DetectorName", mTaskConfig.detectorName);
 
   // setup publisher
-  mObjectsManager = std::make_shared<ObjectsManager>(mTaskConfig.taskName, mTaskConfig.className, mTaskConfig.detectorName, mTaskConfig.parallelTaskID);
+  mObjectsManager = std::make_shared<ObjectsManager>(mTaskConfig.name, mTaskConfig.className, mTaskConfig.detectorName, mTaskConfig.parallelTaskID);
   mObjectsManager->setMovingWindowsList(mTaskConfig.movingWindows);
 
   // setup timekeeping
@@ -374,7 +374,7 @@ bool TaskRunner::isDataReady(const framework::InputRecord& inputs)
 
 void TaskRunner::printTaskConfig() const
 {
-  ILOG(Info, Devel) << "Configuration loaded > Task name : " << mTaskConfig.taskName //
+  ILOG(Info, Devel) << "Configuration loaded > Task name : " << mTaskConfig.name //
                     << " / Module name : " << mTaskConfig.moduleName                 //
                     << " / Detector name : " << mTaskConfig.detectorName             //
                     << " / Max number cycles : " << mTaskConfig.maxNumberCycles      //
@@ -437,7 +437,7 @@ void TaskRunner::registerToBookkeeping()
   if (!gSystem->Getenv("O2_QC_DONT_REGISTER_IN_BK")) { // Set this variable to disable the registration
     // register ourselves to the BK at the first cycle
     ILOG(Debug, Devel) << "Registering taskRunner to BookKeeping" << ENDM;
-    Bookkeeping::getInstance().registerProcess(mActivity.mId, mTaskConfig.taskName, mTaskConfig.detectorName, bkp::DplProcessType::QC_TASK, "");
+    Bookkeeping::getInstance().registerProcess(mActivity.mId, mTaskConfig.name, mTaskConfig.detectorName, bkp::DplProcessType::QC_TASK, "");
   }
 }
 

Framework/src/TaskRunnerFactory.cxx

@@ -169,15 +169,16 @@ TaskRunnerConfig TaskRunnerFactory::extractConfig(const CommonSpec& globalConfig
   o2::globaltracking::RecoContainer rd;
 
   return {
+    taskSpec.taskName,
     taskSpec.moduleName,
     taskSpec.className,
     InfrastructureSpecReader::validateDetectorName(taskSpec.detectorName),
     globalConfig.consulUrl,
     taskSpec.customParameters,
     globalConfig.conditionDBUrl,
     globalConfig.database,
+    taskSpec.dataSources,
     deviceName,
-    taskSpec.taskName,
     multipleCycleDurations,
     taskSpec.maxNumberCycles,
     taskSpec.critical,