fix timezones to UTC

Author: aknopper

flask_monitoringdashboard/controllers/endpoints.py

@@ -32,8 +32,8 @@ def get_endpoint_overview(session):
     :param session: session for the database
     :return: A list of properties for each endpoint that is found in the database
     """
-    week_ago = datetime.datetime.now(datetime.UTC) - datetime.timedelta(days=7)
-    now_local = to_local_datetime(datetime.datetime.now(datetime.UTC))
+    week_ago = datetime.datetime.now(datetime.timezone.utc) - datetime.timedelta(days=7)
+    now_local = to_local_datetime(datetime.datetime.now(datetime.timezone.utc))
     today_local = now_local.replace(hour=0, minute=0, second=0, microsecond=0)
     today_utc = to_utc_datetime(today_local)
 

flask_monitoringdashboard/core/cache.py

@@ -69,15 +69,15 @@ def update_last_requested_cache(endpoint_name):
     Use this instead of updating the last requested to the database.
     """
     global memory_cache
-    memory_cache.get(endpoint_name).set_last_requested(datetime.datetime.now(datetime.UTC))
+    memory_cache.get(endpoint_name).set_last_requested(datetime.datetime.now(datetime.timezone.utc))
 
 
 def update_duration_cache(endpoint_name, duration):
     """
     Use this together with adding a request to the database.
     """
     global memory_cache
-    memory_cache.get(endpoint_name).set_last_requested(datetime.datetime.now(datetime.UTC))
+    memory_cache.get(endpoint_name).set_last_requested(datetime.datetime.now(datetime.timezone.utc))
     memory_cache.get(endpoint_name).set_duration(duration)
 
 

flask_monitoringdashboard/core/database_pruning.py

@@ -23,7 +23,7 @@
 def prune_database_older_than_weeks(weeks_to_keep, delete_custom_graph_data):
     """Prune the database of Request and optionally CustomGraph data older than the specified number of weeks"""
     with session_scope() as session:
-        date_to_delete_from = datetime.utcnow() - timedelta(weeks=weeks_to_keep)
+        date_to_delete_from = datetime.now(datetime.timezone.utc) - timedelta(weeks=weeks_to_keep)
 
         # Prune Request table and related Outlier entries
         requests_to_delete = (

flask_monitoringdashboard/core/telemetry.py

@@ -87,7 +87,7 @@ def initialize_telemetry_session(session):
         else:
             telemetry_user = session.query(TelemetryUser).one()
             telemetry_user.times_initialized += 1
-            telemetry_user.last_initialized = datetime.datetime.now(datetime.UTC)
+            telemetry_user.last_initialized = datetime.datetime.now(datetime.timezone.utc)
             session.commit()
 
         # reset telemetry if declined in previous session

flask_monitoringdashboard/core/timezone.py

@@ -10,9 +10,7 @@ def to_local_datetime(dt):
     from flask_monitoringdashboard import config
 
     if dt:
-        if dt.tzinfo is None:
-            dt = dt.replace(tzinfo=datetime.timezone.utc)
-        return dt.astimezone(config.timezone)
+        return dt + config.timezone.utcoffset(datetime.datetime.now(datetime.timezone.utc))
     return None
 
 
@@ -25,7 +23,5 @@ def to_utc_datetime(dt):
     from flask_monitoringdashboard import config
 
     if dt:
-        if dt.tzinfo is None:
-            dt = dt.replace(tzinfo=config.timezone)
-        return dt.astimezone(datetime.timezone.utc)
+        return dt - config.timezone.utcoffset(datetime.datetime.now(datetime.timezone.utc))
     return None

flask_monitoringdashboard/database/__init__.py

@@ -72,7 +72,7 @@ class TelemetryUser(Base):
     times_initialized = Column(Integer, default=1)
     """For checking the amount of times the app was initialized"""
 
-    last_initialized = Column(DateTime, default=datetime.datetime.utcnow)
+    last_initialized = Column(DateTime, default=datetime.datetime.now(datetime.timezone.utc))
     """Check when was the last time user accessed FMD"""
 
     monitoring_consent = Column(Integer, default=1)
@@ -93,7 +93,7 @@ class Endpoint(Base):
     monitor_level = Column(Integer, default=config.monitor_level)
     """0 - disabled, 1 - performance, 2 - outliers, 3 - profiler + outliers"""
 
-    time_added = Column(DateTime, default=datetime.datetime.utcnow)
+    time_added = Column(DateTime, default=datetime.datetime.now(datetime.timezone.utc))
     """Time when the endpoint was added."""
 
     version_added = Column(String(100), default=config.version)
@@ -118,7 +118,7 @@ class Request(Base):
     duration = Column(Float, nullable=False)
     """Processing time of the request in milliseconds."""
 
-    time_requested = Column(DateTime, default=datetime.datetime.utcnow)
+    time_requested = Column(DateTime, default=datetime.datetime.now(datetime.timezone.utc))
     """Moment when the request was handled."""
 
     version_requested = Column(String(100), default=config.version)
@@ -225,7 +225,7 @@ class CustomGraph(Base):
     title = Column(String(250), nullable=False, unique=True)
     """Title of this graph."""
 
-    time_added = Column(DateTime, default=datetime.datetime.utcnow)
+    time_added = Column(DateTime, default=datetime.datetime.now(datetime.timezone.utc))
     """When the graph was first added to the dashboard."""
 
     version_added = Column(String(100), default=config.version)
@@ -244,7 +244,7 @@ class CustomGraphData(Base):
     graph = relationship(CustomGraph, backref="data")
     """Graph for which the data is collected."""
 
-    time = Column(DateTime, default=datetime.datetime.utcnow)
+    time = Column(DateTime, default=datetime.datetime.now(datetime.timezone.utc))
     """Moment when the data is collected."""
 
     value = Column(Float)

flask_monitoringdashboard/database/endpoint.py

@@ -150,7 +150,7 @@ def update_last_requested(session, endpoint_name, timestamp=None):
     :param endpoint_name: name of the endpoint
     :param timestamp: optional timestamp. If not given, timestamp is current time
     """
-    ts = timestamp if timestamp else datetime.datetime.now(datetime.UTC)
+    ts = timestamp if timestamp else datetime.datetime.now(datetime.timezone.utc)
     session.query(Endpoint).filter(Endpoint.name == endpoint_name).update(
         {Endpoint.last_requested: ts}
     )

flask_monitoringdashboard/views/reporting.py

@@ -19,7 +19,7 @@
 
 
 def get_date(p):
-    return datetime.utcfromtimestamp(int(request.args.get(p)))
+    return datetime.fromtimestamp(int(request.args.get(p)),tz = datetime.datetime.now(datetime.timezone.utc))
 
 
 def make_endpoint_summary(endpoint, requests_criterion, baseline_requests_criterion):

tests/api/test_custom.py

@@ -17,7 +17,7 @@ def test_custom_graphs(dashboard_user, custom_graph, session):
 
 
 def test_custom_graph_data(dashboard_user, custom_graph, custom_graph_data):
-    today = datetime.utcnow()
+    today = datetime.now(datetime.timezone.utc)
     yesterday = today - timedelta(days=1)
     response = dashboard_user.get('dashboard/api/custom_graph/{id}/{start}/{end}'.format(
         id=custom_graph.graph_id,

tests/api/test_reporting.py

@@ -11,10 +11,10 @@ def test_make_report_get(dashboard_user):
     assert not response.is_json
 
 
-@pytest.mark.parametrize('request_1__time_requested', [datetime.utcnow() - timedelta(hours=6)])
+@pytest.mark.parametrize('request_1__time_requested', [datetime.now(datetime.timezone.utc) - timedelta(hours=6)])
 @pytest.mark.parametrize('request_1__duration', [5000])
 @pytest.mark.parametrize('request_1__status_code', [500])
-@pytest.mark.parametrize('request_2__time_requested', [datetime.utcnow() - timedelta(days=1, hours=6)])
+@pytest.mark.parametrize('request_2__time_requested', [datetime.now(datetime.timezone.utc) - timedelta(days=1, hours=6)])
 @pytest.mark.parametrize('request_2__duration', [100])
 @pytest.mark.skipif(sys.version_info < (3, ), reason="For some reason, this doesn't work in python 2.7.")
 def test_make_report_post_not_significant(dashboard_user, endpoint, request_1, request_2, session):
@@ -23,12 +23,12 @@ def test_make_report_post_not_significant(dashboard_user, endpoint, request_1, r
         'dashboard/api/reporting/make_report/intervals',
         json={
             'interval': {
-                'from': (datetime.utcnow() - timedelta(days=1) - epoch).total_seconds(),
-                'to': (datetime.utcnow() - epoch).total_seconds(),
+                'from': (datetime.now(datetime.timezone.utc) - timedelta(days=1) - epoch).total_seconds(),
+                'to': (datetime.now(datetime.timezone.utc) - epoch).total_seconds(),
             },
             'baseline_interval': {
-                'from': (datetime.utcnow() - timedelta(days=2) - epoch).total_seconds(),
-                'to': (datetime.utcnow() - timedelta(days=1) - epoch).total_seconds(),
+                'from': (datetime.now(datetime.timezone.utc) - timedelta(days=2) - epoch).total_seconds(),
+                'to': (datetime.now(datetime.timezone.utc) - timedelta(days=1) - epoch).total_seconds(),
             },
         },
     )