Skip to content

Commit de92475

Browse files
authored
QC-667 Add detector to logging in merger (#7377)
1 parent c9f7b86 commit de92475

File tree

4 files changed

+22
-2
lines changed

4 files changed

+22
-2
lines changed

Utilities/Mergers/include/Mergers/MergerConfig.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ struct MergerConfig {
6464
ConfigEntry<PublicationDecision> publicationDecision = {PublicationDecision::EachNSeconds, 10};
6565
ConfigEntry<TopologySize, int> topologySize = {TopologySize::NumberOfLayers, 1};
6666
std::string monitoringUrl = "infologger:///debug?qc";
67+
std::string detectorName;
6768
};
6869

6970
} // namespace o2::mergers

Utilities/Mergers/src/FullHistoryMerger.cxx

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
#include "Mergers/FullHistoryMerger.h"
1818
#include "Mergers/MergerAlgorithm.h"
1919
#include "Mergers/MergerBuilder.h"
20-
#include "Mergers/MergeInterface.h"
2120

2221
#include "Headers/DataHeader.h"
2322
#include "Framework/InputRecordWalker.h"
2423
#include "Framework/Logger.h"
2524
#include <Monitoring/MonitoringFactory.h>
25+
#include <InfoLogger/InfoLogger.hxx>
2626

2727
using namespace o2::header;
2828
using namespace o2::framework;
@@ -49,6 +49,15 @@ void FullHistoryMerger::init(framework::InitContext& ictx)
4949
mCyclesSinceReset = 0;
5050
mCollector = monitoring::MonitoringFactory::Get(mConfig.monitoringUrl);
5151
mCollector->addGlobalTag(monitoring::tags::Key::Subsystem, monitoring::tags::Value::Mergers);
52+
53+
// set detector field in infologger
54+
AliceO2::InfoLogger::InfoLoggerContext* ilContext = nullptr;
55+
try {
56+
ilContext = &ictx.services().get<AliceO2::InfoLogger::InfoLoggerContext>();
57+
} catch (const RuntimeErrorRef& err) {
58+
LOG(WARN) << "Could not find the DPL InfoLogger Context.";
59+
}
60+
ilContext->setField(AliceO2::InfoLogger::InfoLoggerContext::FieldName::Detector, mConfig.detectorName);
5261
}
5362

5463
void FullHistoryMerger::run(framework::ProcessingContext& ctx)

Utilities/Mergers/src/IntegratingMerger.cxx

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
#include "Mergers/MergerAlgorithm.h"
2020
#include "Mergers/MergerBuilder.h"
2121

22+
#include <InfoLogger/InfoLogger.hxx>
23+
2224
#include <Monitoring/MonitoringFactory.h>
2325

2426
#include "Framework/InputRecordWalker.h"
@@ -40,6 +42,15 @@ void IntegratingMerger::init(framework::InitContext& ictx)
4042
mCyclesSinceReset = 0;
4143
mCollector = monitoring::MonitoringFactory::Get(mConfig.monitoringUrl);
4244
mCollector->addGlobalTag(monitoring::tags::Key::Subsystem, monitoring::tags::Value::Mergers);
45+
46+
// set detector field in infologger
47+
AliceO2::InfoLogger::InfoLoggerContext* ilContext = nullptr;
48+
try {
49+
ilContext = &ictx.services().get<AliceO2::InfoLogger::InfoLoggerContext>();
50+
} catch (const RuntimeErrorRef& err) {
51+
LOG(WARN) << "Could not find the DPL InfoLogger Context.";
52+
}
53+
ilContext->setField(AliceO2::InfoLogger::InfoLoggerContext::FieldName::Detector, mConfig.detectorName);
4354
}
4455

4556
void IntegratingMerger::run(framework::ProcessingContext& ctx)

Utilities/Mergers/src/MergerBuilder.cxx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323

2424
#include "Mergers/MergerBuilder.h"
2525
#include "Mergers/IntegratingMerger.h"
26-
#include "Mergers/FullHistoryMerger.h"
2726

2827
using namespace o2::framework;
2928

0 commit comments

Comments
 (0)