PAUSED: Use git resume to continue working. [skip ci]

Author: himdel

metrics_utility/automation_controller_billing/collectors.py

@@ -49,6 +49,7 @@ def daily_slicing(key, last_gather, **kwargs):
     else:
         from awx.conf.models import Setting
 
+        # FIXME: merge with collector _calculate_collection_interval?
         horizon = until - timedelta(days=get_max_gather_period_days())
         last_entries = Setting.objects.filter(key='AUTOMATION_ANALYTICS_LAST_ENTRIES').first()
         last_entries = json.loads((last_entries.value if last_entries is not None else '') or '{}', object_hook=datetime_hook)

metrics_utility/base/collection.py

@@ -92,14 +92,17 @@ def slices(self):
             return self.fnc_slicing(self.key, last_gather, full_sync_enabled=True)
 
         if self.fnc_slicing:
+            # TODO: accepts since=None? or just never used that way?
             return self.fnc_slicing(self.key, last_gather, since=since, until=until)
 
         # Start/end of gathering based on settings excluding slices
+        # FIXME: merge with collector _calculate_collection_interval?
         last_entry = max(
             self.last_gathered_entry or self.collector.last_gather,
             self.collector.gather_until - timedelta(days=get_max_gather_period_days()),
         )
 
+        ## TODO: gather_since OR last_entry is the answer to Final since-until .. except both ^returns too
         return [(self.collector.gather_since or last_entry, self.collector.gather_until)]
 
     def ship_immediately(self):

metrics_utility/base/collector.py

@@ -211,6 +211,7 @@ def _calculate_collection_interval(self, since, until):
         # `until`, but we want to keep `since` empty if it wasn't passed in because we use that
         # case to know whether to use the bookkeeping settings variables to decide the start of
         # the interval.
+        # FIXME: but we also want to log the real since...
         horizon = until - _timedelta
         if since is not None and since < horizon:
             since = horizon