Take GUID from processGUID() singleton in StatisticsSenderService

This will allow correlating information from the same process in different monitoring systems.
cms-sw · Dec 21, 2021 · 68dc812 · 68dc812
1 parent a3d0a21
commit 68dc812
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/FWCore/Framework/src/InputSource.cc b/FWCore/Framework/src/InputSource.cc
@@ -18,7 +18,7 @@
 #include "FWCore/ServiceRegistry/interface/StreamContext.h"
 #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
 #include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
-#include "FWCore/Utilities/interface/GlobalIdentifier.h"
+#include "FWCore/Utilities/interface/processGUID.h"
 #include "FWCore/Utilities/interface/TimeOfDay.h"
 
 #include <cassert>
@@ -59,7 +59,7 @@ namespace edm {
         branchIDListHelper_(desc.branchIDListHelper_),
         processBlockHelper_(desc.processBlockHelper_),
         thinnedAssociationsHelper_(desc.thinnedAssociationsHelper_),
-        processGUID_(createGlobalIdentifier(true)),
+        processGUID_(edm::processGUID().toBinary()),
         time_(),
         newRun_(true),
         newLumi_(true),

diff --git a/Utilities/StorageFactory/src/StatisticsSenderService.cc b/Utilities/StorageFactory/src/StatisticsSenderService.cc
@@ -5,7 +5,7 @@
 #include "FWCore/Catalog/interface/SiteLocalConfig.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "FWCore/Utilities/interface/Guid.h"
+#include "FWCore/Utilities/interface/processGUID.h"
 
 #include <string>
 #include <cmath>
@@ -169,7 +169,7 @@ StatisticsSenderService::StatisticsSenderService(edm::ParameterSet const &iPSet,
     : m_clienthost("unknown"),
       m_clientdomain("unknown"),
       m_filestats(),
-      m_guid(Guid().toString()),
+      m_guid(edm::processGUID().toString()),
       m_counter(0),
       m_userdn("unknown"),
       m_debug(iPSet.getUntrackedParameter<bool>("debug", false)) {