feat: replace datetime.utcnow and datetime.utcfromtimestamp with Dirac own implementation

Author: martynia

dirac-common/src/DIRACCommon/Core/Utilities/TimeUtilities.py

@@ -23,6 +23,8 @@
 import sys
 import time
 
+from DIRAC.Core.Utilities.TimeUtilities import DiracTime
+
 # Some useful constants for time operations
 microsecond = datetime.timedelta(microseconds=1)
 second = datetime.timedelta(seconds=1)
@@ -111,7 +113,7 @@ def fromEpoch(epoch):
         epoch /= 1000**2
     elif epoch > 10**11:  # milliseconds
         epoch /= 1000
-    return datetime.datetime.utcfromtimestamp(epoch)
+    return DiracTime.utcfromtimestamp(epoch)
 
 
 def toString(myDate=None):

src/DIRAC/AccountingSystem/Agent/NetworkAgent.py

@@ -8,6 +8,7 @@
   :caption: NetworkAgent options
 
 """
+from DIRAC.Core.Utilities.TimeUtilities import DiracTime
 from datetime import datetime
 
 from DIRAC import S_OK, S_ERROR, gLogger
@@ -165,7 +166,7 @@ def processMessage(self, headers, body):
         timestamps = sorted(body["datapoints"])
         for timestamp in timestamps:
             try:
-                date = datetime.utcfromtimestamp(float(timestamp))
+                date = DiracTime.utcfromtimestamp(float(timestamp))
 
                 # create a key that allows to join packet-loss-rate and one-way-delay
                 # metrics in one network accounting record

src/DIRAC/AccountingSystem/Client/Types/BaseAccountingType.py

@@ -1,6 +1,7 @@
 """ Within this module is defined the class from which all other accounting types are defined
 """
 
+from DIRAC.Core.Utilities.TimeUtilities import DiracTime
 import datetime
 
 from DIRAC import S_OK, S_ERROR
@@ -55,7 +56,7 @@ def setStartTime(self, startTime=False):
         By default use now
         """
         if not startTime:
-            self.startTime = datetime.datetime.utcnow()
+            self.startTime = DiracTime.utcnow()
         else:
             self.startTime = startTime
 
@@ -65,15 +66,15 @@ def setEndTime(self, endTime=False):
         By default use now
         """
         if not endTime:
-            self.endTime = datetime.datetime.utcnow()
+            self.endTime = DiracTime.utcnow()
         else:
             self.endTime = endTime
 
     def setNowAsStartAndEndTime(self):
         """
         Set current time as start and end time of the report
         """
-        self.startTime = datetime.datetime.utcnow()
+        self.startTime = DiracTime.utcnow()
         self.endTime = self.startTime
 
     def setValueByKey(self, key, value):

src/DIRAC/AccountingSystem/DB/AccountingDB.py

@@ -1,3 +1,4 @@
+from DIRAC.Core.Utilities.TimeUtilities import DiracTime
 """Frontend to MySQL DB AccountingDB"""
 
 import datetime
@@ -50,7 +51,7 @@ def __init__(self, name="Accounting/AccountingDB", readOnly=False, parentLogger=
             minute=random.randint(0, 59),  # nosec B311
             second=random.randint(0, 59),  # nosec B311
         )
-        lcd = datetime.datetime.utcnow()
+        lcd = DiracTime.utcnow()
         lcd.replace(hour=self.__compactTime.hour + 1, minute=0, second=0)
         self.__lastCompactionEpoch = TimeUtilities.toEpoch(lcd)
         self.__registerTypes()
@@ -69,7 +70,7 @@ def autoCompactDB(self):
 
     def __periodicAutoCompactDB(self):
         while self.autoCompact:
-            nct = datetime.datetime.utcnow()
+            nct = DiracTime.utcnow()
             if nct.hour >= self.__compactTime.hour:
                 nct = nct + datetime.timedelta(days=1)
             nct = nct.replace(

src/DIRAC/AccountingSystem/Service/ReportGeneratorHandler.py

@@ -6,6 +6,7 @@
   :dedent: 2
   :caption: ReportGenerator options
 """
+from DIRAC.Core.Utilities.TimeUtilities import DiracTime
 import os
 import datetime
 
@@ -76,13 +77,13 @@ def __checkPlotRequest(self, reportRequest):
                 return S_ERROR("Value Error")
             if lastSeconds < 3600:
                 return S_ERROR("lastSeconds must be more than 3600")
-            now = datetime.datetime.utcnow()
+            now = DiracTime.utcnow()
             reportRequest["endTime"] = now
             reportRequest["startTime"] = now - datetime.timedelta(seconds=lastSeconds)
         else:
             # if enddate is not there, just set it to now
             if not reportRequest.get("endTime", False):
-                reportRequest["endTime"] = datetime.datetime.utcnow()
+                reportRequest["endTime"] = DiracTime.utcnow()
         # Check keys
         for key, keyType in self.__reportRequestDict.items():
             if key not in reportRequest:

src/DIRAC/ConfigurationSystem/Client/CSAPI.py

@@ -3,6 +3,7 @@
     Most of these functions can only be done by administrators
 """
 
+from DIRAC.Core.Utilities.TimeUtilities import DiracTime
 import datetime
 
 from DIRAC import S_ERROR, S_OK, gConfig, gLogger
@@ -104,7 +105,7 @@ def initialize(self):
         self.__csMod = Modificator(
             self.__rpcClient,
             "%s - %s - %s"
-            % (self.__userGroup, self.__userDN, datetime.datetime.utcnow().strftime("%Y-%m-%d %H:%M:%S")),
+            % (self.__userGroup, self.__userDN, DiracTime.utcnow().strftime("%Y-%m-%d %H:%M:%S")),
         )
         retVal = self.downloadCSData()
         if not retVal["OK"]:

src/DIRAC/ConfigurationSystem/private/ConfigurationData.py

@@ -1,6 +1,7 @@
 """ ConfigurationData module is the base for cfg files management
 """
 
+from DIRAC.Core.Utilities.TimeUtilities import DiracTime
 import os.path
 import zlib
 import zipfile
@@ -201,7 +202,7 @@ def deleteOptionInCFG(self, path, cfg=False):
         self.sync()
 
     def generateNewVersion(self):
-        self.setVersion(str(datetime.datetime.utcnow()))
+        self.setVersion(str(DiracTime.utcnow()))
         self.sync()
         gLogger.info(f"Generated new version {self.getVersion()}")
 
@@ -326,7 +327,7 @@ def dumpRemoteCFGToFile(self, fileName):
     def __backupCurrentConfiguration(self, backupName):
         configurationFilename = f"{self.getName()}.cfg"
         configurationFile = os.path.join(DIRAC.rootPath, "etc", configurationFilename)
-        today = datetime.datetime.utcnow().date()
+        today = DiracTime.utcnow().date()
         backupPath = os.path.join(self.getBackupDir(), str(today.year), "%02d" % today.month)
         mkDir(backupPath)
         backupFile = os.path.join(backupPath, configurationFilename.replace(".cfg", f".{backupName}.zip"))

src/DIRAC/ConfigurationSystem/private/Modificator.py

@@ -1,5 +1,6 @@
 """ This is the guy that actually modifies the content of the CS
 """
+from DIRAC.Core.Utilities.TimeUtilities import DiracTime
 import datetime
 import difflib
 import zlib
@@ -29,7 +30,7 @@ def loadCredentials(self):
             self.commiterId = "{}@{} - {}".format(
                 credDict["username"],
                 credDict["group"],
-                datetime.datetime.utcnow().strftime("%Y-%m-%d %H:%M:%S"),
+                DiracTime.utcnow().strftime("%Y-%m-%d %H:%M:%S"),
             )
             return retVal
         return retVal

src/DIRAC/ConfigurationSystem/scripts/dirac_admin_sort_cs_sites.py

@@ -3,6 +3,7 @@
 # File :    dirac-admin-sort-cs-sites
 # Author :  Matvey Sapunov
 ########################################################################
+from DIRAC.Core.Utilities.TimeUtilities import DiracTime
 """
 Sort site names at CS in "/Resources" section. Sort can be alphabetic or by country postfix in a site name.
 Alphabetic sort is default (i.e. LCG.IHEP.cn, LCG.IHEP.su, LCG.IN2P3.fr)
@@ -112,7 +113,7 @@ def main():
         gLogger.notice("Nothing to do, site names are already sorted")
         DIRACExit(0)
 
-    timestamp = str(datetime.utcnow())
+    timestamp = str(DiracTime.utcnow())
     stamp = f"Site names are sorted by {Script.scriptName} script at {timestamp}"
     cs.setOptionComment("/Resources/Sites", stamp)
 

src/DIRAC/Core/Base/AgentModule.py

@@ -1,6 +1,7 @@
 """
   Base class for all agent modules
 """
+from DIRAC.Core.Utilities.TimeUtilities import DiracTime
 import datetime
 import importlib.metadata
 import inspect
@@ -233,7 +234,7 @@ def am_checkStopAgentFile(self):
     def am_createStopAgentFile(self):
         try:
             with open(self.am_getStopAgentFile(), "w") as fd:
-                fd.write(f"Dirac site agent Stopped at {str(datetime.datetime.utcnow())}")
+                fd.write(f"Dirac site agent Stopped at {str(DiracTime.utcnow())}")
         except Exception as err:
             self.log.info(f"Failed to write stop file: {str(err)}")