fix: Removing gMonitor from more files

Author: rupozzi

src/DIRAC/AccountingSystem/DB/AccountingDB.py

@@ -7,7 +7,6 @@
 
 from DIRAC.Core.Base.DB import DB
 from DIRAC import S_OK, S_ERROR, gConfig
-from DIRAC.FrameworkSystem.Client.MonitoringClient import gMonitor
 from DIRAC.Core.Utilities import List, ThreadSafe, Time, DEncode
 from DIRAC.Core.Utilities.Plotting.TypeLoader import TypeLoader
 from DIRAC.Core.Utilities.ThreadPool import ThreadPool
@@ -48,9 +47,6 @@ def __init__(self, name="Accounting/AccountingDB", readOnly=False):
             }
         )
         self.__loadCatalogFromDB()
-        gMonitor.registerActivity("registeradded", "Register added", "Accounting", "entries", gMonitor.OP_ACUM)
-        gMonitor.registerActivity("insertiontime", "Record insertion time", "Accounting", "seconds", gMonitor.OP_MEAN)
-        gMonitor.registerActivity("querytime", "Records query time", "Accounting", "seconds", gMonitor.OP_MEAN)
 
         self.__compactTime = datetime.time(hour=2, minute=random.randint(0, 59), second=random.randint(0, 59))
         lcd = Time.dateTime()
@@ -281,20 +277,6 @@ def registerType(self, name, definitionKeyFields, definitionAccountingFields, bu
         """
         Register a new type
         """
-        gMonitor.registerActivity(
-            "registerwaiting:%s" % name,
-            "Records waiting for insertion for %s" % " ".join(name.split("_")),
-            "Accounting",
-            "records",
-            gMonitor.OP_MEAN,
-        )
-        gMonitor.registerActivity(
-            "registeradded:%s" % name,
-            "Register added for %s" % " ".join(name.split("_")),
-            "Accounting",
-            "entries",
-            gMonitor.OP_ACUM,
-        )
 
         result = self.__loadTablesCreated()
         if not result["OK"]:
@@ -628,16 +610,13 @@ def __insertFromINTable(self, recordTuples):
             result = self._update("DELETE FROM `%s` WHERE id=%s" % (_getTableName("in", typeName), iD))
             if not result["OK"]:
                 self.log.error("Can't delete row from the IN table", result["Message"])
-            gMonitor.addMark("insertiontime", Time.toEpoch() - insertionEpoch)
 
     def insertRecordDirectly(self, typeName, startTime, endTime, valuesList):
         """
         Add an entry to the type contents
         """
         if self.__readOnly:
             return S_ERROR("ReadOnly mode enabled. No modification allowed")
-        gMonitor.addMark("registeradded", 1)
-        gMonitor.addMark("registeradded:%s" % typeName, 1)
         self.log.info(
             "Adding record", "for type %s\n [%s -> %s]" % (typeName, Time.fromEpoch(startTime), Time.fromEpoch(endTime))
         )
@@ -977,7 +956,6 @@ def retrieveBucketedData(
         result = self.__queryType(
             typeName, startTime, endTime, selectFields, condDict, groupFields, orderFields, "bucket", connObj=connObj
         )
-        gMonitor.addMark("querytime", Time.toEpoch() - startQueryEpoch)
         return result
 
     def __queryType(

src/DIRAC/AccountingSystem/Service/ReportGeneratorHandler.py

@@ -12,7 +12,6 @@
 from DIRAC import S_OK, S_ERROR, rootPath, gConfig, gLogger
 from DIRAC.Core.Utilities.File import mkDir
 from DIRAC.Core.Utilities import Time
-from DIRAC.FrameworkSystem.Client.MonitoringClient import gMonitor
 from DIRAC.AccountingSystem.DB.MultiAccountingDB import MultiAccountingDB
 from DIRAC.Core.Utilities.Plotting import gDataCache
 from DIRAC.AccountingSystem.private.MainReporter import MainReporter
@@ -59,10 +58,6 @@ def initializeHandler(cls, serviceInfo):
             gLogger.fatal("Can't write to %s" % dataPath)
             return S_ERROR("Data location is not writable")
         gDataCache.setGraphsLocation(dataPath)
-        gMonitor.registerActivity("plotsDrawn", "Drawn plot images", "Accounting reports", "plots", gMonitor.OP_SUM)
-        gMonitor.registerActivity(
-            "reportsRequested", "Generated reports", "Accounting reports", "reports", gMonitor.OP_SUM
-        )
         return S_OK()
 
     def __checkPlotRequest(self, reportRequest):
@@ -121,7 +116,6 @@ def export_generatePlot(self, reportRequest):
         if not retVal["OK"]:
             return retVal
         reporter = MainReporter(self.__acDB, self.serviceInfoDict["clientSetup"])
-        gMonitor.addMark("plotsDrawn")
         reportRequest["generatePlot"] = True
         return reporter.generate(reportRequest, self.getRemoteCredentials())
 
@@ -143,7 +137,6 @@ def export_getReport(self, reportRequest):
         if not retVal["OK"]:
             return retVal
         reporter = MainReporter(self.__acDB, self.serviceInfoDict["clientSetup"])
-        gMonitor.addMark("reportsRequested")
         reportRequest["generatePlot"] = False
         return reporter.generate(reportRequest, self.getRemoteCredentials())
 

src/DIRAC/Core/Base/AgentModule.py

@@ -19,8 +19,6 @@
 from DIRAC.Core.Utilities.Shifter import setupShifterProxyInEnv
 from DIRAC.Core.Utilities.ReturnValues import isReturnStructure
 from DIRAC.ConfigurationSystem.Client import PathFinder
-from DIRAC.FrameworkSystem.Client.MonitoringClient import MonitoringClient
-from DIRAC.FrameworkSystem.Client.MonitoringClient import gMonitor
 from DIRAC.Core.Utilities.ThreadScheduler import gThreadScheduler
 from DIRAC.ConfigurationSystem.Client.Helpers.Operations import Operations
 
@@ -144,7 +142,6 @@ def __init__(self, agentName, loadName, baseAgentName=False, properties={}):
             self.__moduleProperties["shifterProxy"] = False
 
         self.__monitorLastStatsUpdate = -1
-        self.monitor = None
 
     def __getCodeInfo(self):
 
@@ -188,8 +185,6 @@ def am_initialize(self, *initArgs):
         self.__initializeMonitor()
 
         self.__moduleProperties["shifterProxy"] = self.am_getOption("shifterProxy")
-        if self.am_monitoringEnabled() and not self.activityMonitoring:
-            self.monitor.enable()
         if len(self.__moduleProperties["executors"]) < 1:
             return S_ERROR("At least one executor method has to be defined")
         if not self.am_Enabled():
@@ -315,22 +310,6 @@ def __initializeMonitor(self):
             self.activityMonitoringReporter = MonitoringReporter(monitoringType="ComponentMonitoring")
             # With the help of this periodic task we commit the data to ES at an interval of 100 seconds.
             gThreadScheduler.addPeriodicTask(100, self.__activityMonitoringReporting)
-        else:
-            if self.__moduleProperties["standalone"]:
-                self.monitor = gMonitor
-            else:
-                self.monitor = MonitoringClient()
-            self.monitor.setComponentType(self.monitor.COMPONENT_AGENT)
-            self.monitor.setComponentName(self.__moduleProperties["fullName"])
-            self.monitor.initialize()
-            self.monitor.registerActivity("CPU", "CPU Usage", "Framework", "CPU,%", self.monitor.OP_MEAN, 600)
-            self.monitor.registerActivity("MEM", "Memory Usage", "Framework", "Memory,MB", self.monitor.OP_MEAN, 600)
-            # Component monitor
-            for field in ("version", "DIRACVersion", "description", "platform"):
-                self.monitor.setComponentExtraParam(field, self.__codeProperties[field])
-            self.monitor.setComponentExtraParam("startTime", Time.dateTime())
-            self.monitor.setComponentExtraParam("cycles", 0)
-            self.monitor.disable()
             self.__monitorLastStatsUpdate = time.time()
 
     def am_secureCall(self, functor, args=(), name=False):
@@ -410,8 +389,6 @@ def am_go(self):
             self.log.warn(" Cycle had an error:", cycleResult["Message"])
         self.log.notice("-" * 40)
         # Update number of cycles
-        if not self.activityMonitoring:
-            self.monitor.setComponentExtraParam("cycles", self.__moduleProperties["cyclesDone"])
         # cycle finished successfully, cancel watchdog
         if watchdogInt > 0:
             signal.alarm(0)
@@ -431,7 +408,6 @@ def _startReportToMonitoring(self):
                 membytes = MemStat.VmB("VmRSS:")
                 if membytes:
                     mem = membytes / (1024.0 * 1024.0)
-                    gMonitor.addMark("MEM", mem)
                 return (now, cpuTime)
             else:
                 return False
@@ -445,8 +421,7 @@ def _endReportToMonitoring(self, initialWallTime, initialCPUTime):
         percentage = 0
         if wallTime:
             percentage = cpuTime / wallTime * 100.0
-        if percentage > 0:
-            gMonitor.addMark("CPU", percentage)
+        return percentage
 
     def __executeModuleCycle(self):
         # Execute the beginExecution function

src/DIRAC/Core/DISET/private/Service.py

@@ -28,8 +28,6 @@
 from DIRAC.Core.Utilities.DErrno import ENOAUTH
 from DIRAC.Core.Utilities.ReturnValues import isReturnStructure
 from DIRAC.Core.Utilities.ThreadScheduler import gThreadScheduler
-from DIRAC.FrameworkSystem.Client.MonitoringClient import gMonitor
-from DIRAC.FrameworkSystem.Client.MonitoringClient import MonitoringClient
 from DIRAC.FrameworkSystem.Client.SecurityLogClient import SecurityLogClient