From 5d2898e48abf6d45c44ee3a8793981bc3d11d3c3 Mon Sep 17 00:00:00 2001
From: Christopher Jones <cdj@fnal.gov>
Date: Wed, 13 Jul 2022 21:35:01 +0200
Subject: [PATCH] Avoid ID collisions between ED and ES modules in
 MessageLogger

---
 FWCore/MessageService/plugins/MessageLogger.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/FWCore/MessageService/plugins/MessageLogger.cc b/FWCore/MessageService/plugins/MessageLogger.cc
index a914262c1e320..d8d0122a0df5e 100644
--- a/FWCore/MessageService/plugins/MessageLogger.cc
+++ b/FWCore/MessageService/plugins/MessageLogger.cc
@@ -764,7 +764,8 @@ namespace edm {
       if (label->empty() or (*label)[0] == '\0') {
         label = &desc->type_;
       }
-      messageDrop->setModuleWithPhase(desc->type_, *label, desc->id_, "@callESModule");
+      //make sure ES module IDs do not conflict with ED module IDs
+      messageDrop->setModuleWithPhase(desc->type_, *label, 1000000 + desc->id_, "@callESModule");
     }
     void MessageLogger::postESModule(eventsetup::EventSetupRecordKey const&, ESModuleCallingContext const&) {
       MessageDrop* messageDrop = MessageDrop::instance();