[QC-585] Pass Monitoring URL to Mergers (#708)

knopers8 · Barthelemy · web-flow · commit 505e82ed0d8a · 2021-06-23T08:25:14.000+02:00
* [QC-585] Pass Monitoring URL to Mergers

* delete empty line

* trigger new build

* fix test

Co-authored-by: Barthélémy von Haller &lt;barthelemy.von.haller@gmail.com&gt;
diff --git a/Framework/include/QualityControl/InfrastructureGenerator.h b/Framework/include/QualityControl/InfrastructureGenerator.h
@@ -149,7 +149,8 @@ class InfrastructureGenerator
                               std::string taskName,
                               size_t numberOfLocalMachines,
                               double cycleDurationSeconds,
-                              std::string mergingMode);
+                              std::string mergingMode,
+                              std::string monitoringUrl);
   static vector<framework::OutputSpec> generateCheckRunners(framework::WorkflowSpec& workflow, std::string configurationSource);
   static void generateAggregator(framework::WorkflowSpec& workflow, std::string configurationSource, vector<framework::OutputSpec>& checkRunnerOutputs);
   static void generatePostProcessing(framework::WorkflowSpec& workflow, std::string configurationSource);
diff --git a/Framework/src/InfrastructureGenerator.cxx b/Framework/src/InfrastructureGenerator.cxx
@@ -213,7 +213,8 @@ o2::framework::WorkflowSpec InfrastructureGenerator::generateRemoteInfrastructur
 
         generateMergers(workflow, taskName, numberOfLocalMachines,
                         taskConfig.get<double>("cycleDurationSeconds"),
-                        taskConfig.get<std::string>("mergingMode", "delta"));
+                        taskConfig.get<std::string>("mergingMode", "delta"),
+                        config->get<std::string>("qc.config.monitoring.url"));
 
       } else if (taskConfig.get<std::string>("location") == "remote") {
 
@@ -369,7 +370,7 @@ void InfrastructureGenerator::generateLocalTaskRemoteProxy(framework::WorkflowSp
 
 void InfrastructureGenerator::generateMergers(framework::WorkflowSpec& workflow, std::string taskName,
                                               size_t numberOfLocalMachines, double cycleDurationSeconds,
-                                              std::string mergingMode)
+                                              std::string mergingMode, std::string monitoringUrl)
 {
   Inputs mergerInputs;
   for (size_t id = 1; id <= numberOfLocalMachines; id++) {
@@ -390,8 +391,9 @@ void InfrastructureGenerator::generateMergers(framework::WorkflowSpec& workflow,
   mergerConfig.inputObjectTimespan = { (mergingMode.empty() || mergingMode == "delta") ? InputObjectsTimespan::LastDifference : InputObjectsTimespan::FullHistory };
   mergerConfig.publicationDecision = { PublicationDecision::EachNSeconds, cycleDurationSeconds };
   mergerConfig.mergedObjectTimespan = { MergedObjectTimespan::FullHistory, 0 };
-  // for now one merger should be enough, multiple layers to be supported later
+  // for now one merger should be enough, multiple layers will be supported later
   mergerConfig.topologySize = { TopologySize::NumberOfLayers, 1 };
+  mergerConfig.monitoringUrl = monitoringUrl;
   mergersBuilder.setConfig(mergerConfig);
 
   mergersBuilder.generateInfrastructure(workflow);
diff --git a/Framework/test/testSharedConfig.json b/Framework/test/testSharedConfig.json
@@ -11,6 +11,9 @@
       "Activity": {
         "number": "42",
         "type": "2"
+      },
+      "monitoring": {
+        "url": "infologger:///debug?qc"
       }
     },
     "tasks": {
