refactor: Removing gMonitor from Service.py

Author: rupozzi

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

@@ -69,8 +69,6 @@ def __init__(self, serviceData):
 
     def setCloneProcessId(self, cloneId):
         self.__cloneId = cloneId
-        if not self.activityMonitoring:
-            self._monitor.setComponentName("%s-Clone:%s" % (self._name, cloneId))
 
     def _isMetaAction(self, action):
         referedAction = Service.SVC_VALID_ACTIONS[action]
@@ -117,21 +115,13 @@ def initialize(self):
 
             self.activityMonitoringReporter = MonitoringReporter(monitoringType="ComponentMonitoring")
             gThreadScheduler.addPeriodicTask(100, self.__activityMonitoringReporting)
-        elif self._standalone:
-            self._monitor = gMonitor
-        else:
-            self._monitor = MonitoringClient()
         self._initMonitoring()
         # Call static initialization function
         try:
             if self.activityMonitoring:
                 self._handler["class"]._rh__initializeClass(
                     dict(self._serviceInfoDict), self._lockManager, self._msgBroker, self.activityMonitoringReporter
                 )
-            else:
-                self._handler["class"]._rh__initializeClass(
-                    dict(self._serviceInfoDict), self._lockManager, self._msgBroker, self._monitor
-                )
             if self._handler["init"]:
                 for initFunc in self._handler["init"]:
                     gLogger.verbose("Executing initialization function")
@@ -255,61 +245,15 @@ def _loadActions(self):
         return S_OK({"methods": methodsList, "auth": authRules, "types": typeCheck})
 
     def _initMonitoring(self):
-        if not self.activityMonitoring:
-            # Init extra bits of monitoring
-            self._monitor.setComponentType(MonitoringClient.COMPONENT_SERVICE)
-            self._monitor.setComponentName(self._name)
-            self._monitor.setComponentLocation(self._cfg.getURL())
-            self._monitor.initialize()
-            self._monitor.registerActivity(
-                "Connections", "Connections received", "Framework", "connections", MonitoringClient.OP_RATE
-            )
-            self._monitor.registerActivity(
-                "Queries", "Queries served", "Framework", "queries", MonitoringClient.OP_RATE
-            )
-            self._monitor.registerActivity("CPU", "CPU Usage", "Framework", "CPU,%", MonitoringClient.OP_MEAN, 600)
-            self._monitor.registerActivity(
-                "MEM", "Memory Usage", "Framework", "Memory,MB", MonitoringClient.OP_MEAN, 600
-            )
-            self._monitor.registerActivity(
-                "PendingQueries", "Pending queries", "Framework", "queries", MonitoringClient.OP_MEAN
-            )
-            self._monitor.registerActivity(
-                "ActiveQueries", "Active queries", "Framework", "threads", MonitoringClient.OP_MEAN
-            )
-            self._monitor.registerActivity(
-                "RunningThreads", "Running threads", "Framework", "threads", MonitoringClient.OP_MEAN
-            )
-            self._monitor.registerActivity("MaxFD", "Max File Descriptors", "Framework", "fd", MonitoringClient.OP_MEAN)
-
-            self._monitor.setComponentExtraParam("DIRACVersion", DIRAC.version)
-            self._monitor.setComponentExtraParam("platform", DIRAC.getPlatform())
-            self._monitor.setComponentExtraParam("startTime", Time.dateTime())
-            props = [("__doc__", "description")]
-            for prop in props:
-                try:
-                    value = getattr(self._handler["module"], prop[0])
-                except Exception as e:
-                    gLogger.exception(e)
-                    gLogger.error("Missing property", prop[0])
-                    value = "unset"
-                self._monitor.setComponentExtraParam(prop[1], value)
-
         for secondaryName in self._cfg.registerAlsoAs():
             gLogger.info("Registering %s also as %s" % (self._name, secondaryName))
             self._validNames.append(secondaryName)
-
         return S_OK()
 
     def __reportThreadPoolContents(self):
         # TODO: remove later
         pendingQueries = self._threadPool._work_queue.qsize()
         activeQuereies = len(self._threadPool._threads)
-
-        self._monitor.addMark("PendingQueries", pendingQueries)
-        self._monitor.addMark("ActiveQueries", activeQuereies)
-        self._monitor.addMark("RunningThreads", threading.activeCount())
-        self._monitor.addMark("MaxFD", self.__maxFD)
         self.__maxFD = 0
 
     def getConfig(self):
@@ -327,7 +271,6 @@ def handleConnection(self, clientTransport):
         """
         if not self.activityMonitoring:
             self._stats["connections"] += 1
-            self._monitor.setComponentExtraParam("queries", self._stats["connections"])
         self._threadPool.submit(self._processInThread, clientTransport)
 
     @property
@@ -663,9 +606,6 @@ def __activityMonitoringReporting(self):
         return result["OK"]
 
     def __startReportToMonitoring(self):
-        if not self.activityMonitoring:
-            self._monitor.addMark("Queries")
-
         now = time.time()
         stats = os.times()
         cpuTime = stats[0] + stats[2]
@@ -677,15 +617,11 @@ def __startReportToMonitoring(self):
         membytes = MemStat.VmB("VmRSS:")
         if membytes:
             mem = membytes / (1024.0 * 1024.0)
-            if not self.activityMonitoring:
-                self._monitor.addMark("MEM", mem)
         return (now, cpuTime)
 
     def __endReportToMonitoring(self, initialWallTime, initialCPUTime):
         wallTime = time.time() - initialWallTime
         stats = os.times()
         cpuTime = stats[0] + stats[2] - initialCPUTime
         percentage = cpuTime / wallTime * 100.0
-        if percentage > 0:
-            if not self.activityMonitoring:
-                self._monitor.addMark("CPU", percentage)
+        return percentage