DPL: do not depend on monitoring for DataProcessingDevice.cxx

Author: ktf

Framework/Core/src/CommonServices.cxx

@@ -59,6 +59,7 @@ struct ServiceKindExtractor<InfoLoggerContext> {
   constexpr static ServiceKind kind = ServiceKind::Global;
 };
 
+#define MONITORING_QUEUE_SIZE 100
 o2::framework::ServiceSpec CommonServices::monitoringSpec()
 {
   return ServiceSpec{"monitoring",
@@ -67,14 +68,18 @@ o2::framework::ServiceSpec CommonServices::monitoringSpec()
                        bool isWebsocket = strncmp(options.GetPropertyAsString("driver-client-backend").c_str(), "ws://", 4) == 0;
                        bool isDefault = options.GetPropertyAsString("monitoring-backend") == "default";
                        bool useDPL = (isWebsocket && isDefault) || options.GetPropertyAsString("monitoring-backend") == "dpl://";
+                       o2::monitoring::Monitoring* monitoring;
                        if (useDPL) {
-                         auto monitoring = new Monitoring();
+                         monitoring = new Monitoring();
                          monitoring->addBackend(std::make_unique<DPLMonitoringBackend>(registry));
-                         service = monitoring;
                        } else {
                          auto backend = isDefault ? "infologger://" : options.GetPropertyAsString("monitoring-backend");
-                         service = MonitoringFactory::Get(backend).release();
+                         monitoring = MonitoringFactory::Get(backend).release();
                        }
+                       service = monitoring;
+                       monitoring->enableBuffering(MONITORING_QUEUE_SIZE);
+                       assert(registry.get<DeviceSpec const>().name.empty() == false);
+                       monitoring->addGlobalTag("dataprocessor_id", registry.get<DeviceSpec const>().name);
                        return ServiceHandle{TypeIdHelpers::uniqueId<Monitoring>(), service};
                      },
                      noConfiguration(),

Framework/Core/src/DataProcessingDevice.cxx

@@ -32,7 +32,6 @@
 #include "Framework/Signpost.h"
 #include "Framework/SourceInfoHeader.h"
 #include "Framework/Logger.h"
-#include "Framework/Monitoring.h"
 #include "Framework/DriverClient.h"
 #include "PropertyTreeHelpers.h"
 #include "DataProcessingStatus.h"
@@ -61,11 +60,9 @@
 #include <boost/property_tree/json_parser.hpp>
 
 using namespace o2::framework;
-using namespace o2::monitoring;
 using ConfigurationInterface = o2::configuration::ConfigurationInterface;
 using DataHeader = o2::header::DataHeader;
 
-constexpr unsigned int MONITORING_QUEUE_SIZE = 100;
 constexpr unsigned int MIN_RATE_LOGGING = 60;
 
 namespace o2::framework
@@ -260,12 +257,6 @@ void DataProcessingDevice::Init()
     mExpirationHandlers.emplace_back(std::move(handler));
   }
 
-  auto& monitoring = mServiceRegistry.get<Monitoring>();
-  monitoring.enableBuffering(MONITORING_QUEUE_SIZE);
-  static const std::string dataProcessorIdMetric = "dataprocessor_id";
-  static const std::string dataProcessorIdValue = mSpec.name;
-  monitoring.addGlobalTag("dataprocessor_id", dataProcessorIdValue);
-
   if (mInit) {
     InitContext initContext{*mConfigRegistry, mServiceRegistry};
     mStatefulProcess = mInit(initContext);