fix: Removing MonitoringClient

Author: rupozzi

src/DIRAC/Core/Base/AgentModule.py

@@ -284,12 +284,6 @@ def am_getCyclesDone(self):
     def am_Enabled(self):
         return self.am_getOption("Enabled")
 
-    def am_disableMonitoring(self):
-        self.am_setOption("MonitoringEnabled", False)
-
-    def am_monitoringEnabled(self):
-        return self.am_getOption("MonitoringEnabled")
-
     def am_stopExecution(self):
         self.am_setModuleParam("alive", False)
 
@@ -299,9 +293,7 @@ def __initializeMonitor(self):
         """
         # This flag is used to activate ES based monitoring
         # if the "EnableActivityMonitoring" flag in "yes" or "true" in the cfg file.
-        self.activityMonitoring = (
-            Operations().getValue("EnableActivityMonitoring", False) and self.am_monitoringEnabled()
-        )
+        self.activityMonitoring = Operations().getValue("EnableActivityMonitoring", False)
         if self.activityMonitoring:
             # The import needs to be here because of the CS must be initialized before importing
             # this class (see https://github.com/DIRACGrid/DIRAC/issues/4793)

src/DIRAC/Core/Base/Script.py

@@ -96,8 +96,6 @@ def initialize(cls, script=False, ignoreErrors=False, initializeMonitor=False, e
         :param bool initializeMonitor: to use monitoring
         :param bool enableCommandLine: enable parse command line
         """
-        # MonitoringClient has dependencies in DIRAC.Core.Base, so to avoid recurrence we'll leave it here
-        from DIRAC.FrameworkSystem.Client.MonitoringClient import gMonitor
 
         # Please do not call initialize in every file
         if cls.alreadyInitialized:
@@ -122,13 +120,6 @@ def initialize(cls, script=False, ignoreErrors=False, initializeMonitor=False, e
             sys.exit(1)
         if not userDisabled:
             cls.localCfg.enableCS()
-        if initializeMonitor:
-            gMonitor.setComponentType(gMonitor.COMPONENT_SCRIPT)
-            gMonitor.setComponentName(cls.scriptName)
-            gMonitor.setComponentLocation("script")
-            gMonitor.initialize()
-        else:
-            gMonitor.disable()
         includeExtensionErrors()
         return True
 

src/DIRAC/Core/Tornado/Server/private/BaseRequestHandler.py

@@ -26,7 +26,6 @@
 from DIRAC.Core.Utilities.JEncode import decode, encode
 from DIRAC.Core.Utilities.ReturnValues import isReturnStructure
 from DIRAC.Core.Security.X509Chain import X509Chain  # pylint: disable=import-error
-from DIRAC.FrameworkSystem.Client.MonitoringClient import MonitoringClient
 from DIRAC.Resources.IdProvider.Utilities import getProvidersForInstance
 from DIRAC.Resources.IdProvider.IdProviderFactory import IdProviderFactory
 
@@ -273,11 +272,6 @@ def _authzMYAUTH(self):
     # Lock to make sure that two threads are not initializing at the same time
     __init_lock = threading.RLock()
 
-    # MonitoringClient, we don't use gMonitor which is not thread-safe
-    # We also need to add specific attributes for each service
-    # See __initMonitoring method for the details.
-    _monitor = None
-
     # Definition of identity providers, used to authorize requests with access tokens
     _idps = IdProviderFactory()
     _idp = {}
@@ -291,17 +285,13 @@ def _authzMYAUTH(self):
     # Developer can overwrite this
     # if your handler is outside the DIRAC system package (src/DIRAC/XXXSystem/<path to your handler>)
     SYSTEM_NAME = None
-    COMPONENT_NAME = None
 
     # Base system URL. If defined, it is added as a prefix to the handler generated.
     BASE_URL = None
 
     # Base handler URL
     DEFAULT_LOCATION = "/"
 
-    # Type of component, see MonitoringClient class
-    MONITORING_COMPONENT = MonitoringClient.COMPONENT_WEB
-
     # Prefix of the target methods names if need to use a special prefix. By default its "export_".
     METHOD_PREFIX = "export_"
 
@@ -379,27 +369,6 @@ def __initMonitoring(cls, fullComponentName: str, fullUrl: str) -> dict:
         :param componentName: relative URL ``/<System>/<Component>``
         :param fullUrl: full URl like ``https://<host>:<port>/<System>/<Component>``
         """
-
-        # Init extra bits of monitoring
-
-        cls._monitor = MonitoringClient()
-        cls._monitor.setComponentType(cls.MONITORING_COMPONENT)
-
-        cls._monitor.initialize()
-
-        if tornado.process.task_id() is None:  # Single process mode
-            cls._monitor.setComponentName("Tornado/%s" % fullComponentName)
-        else:
-            cls._monitor.setComponentName("Tornado/CPU%d/%s" % (tornado.process.task_id(), fullComponentName))
-
-        cls._monitor.setComponentLocation(fullUrl)
-
-        cls._monitor.registerActivity("Queries", "Queries served", "Framework", "queries", MonitoringClient.OP_RATE)
-
-        cls._monitor.setComponentExtraParam("DIRACVersion", DIRAC.version)
-        cls._monitor.setComponentExtraParam("platform", DIRAC.getPlatform())
-        cls._monitor.setComponentExtraParam("startTime", datetime.utcnow())
-
         cls._stats = {"requests": 0, "monitorLastStatsUpdate": time.time()}
 
         return S_OK()
@@ -544,10 +513,7 @@ def _monitorRequest(self) -> None:
         """Monitor action for each request.
         CAN be implemented by developer.
         """
-        self._monitor.setComponentLocation(self.request.path)
         self._stats["requests"] += 1
-        self._monitor.setComponentExtraParam("queries", self._stats["requests"])
-        self._monitor.addMark("Queries")
 
     def _getMethod(self):
         """Parse method name from incoming request.