sampling rate makes no sense on SDIA and XGBoost provider

Author: ArneTR

config.yml.example

@@ -178,12 +178,10 @@ measurement:
 ##        host_ip: 192.168.1.2 # This only needs to be enabled if automatic detection fails
     #--- Model based - These providers estimate rather than measure. Helpful where measuring is not possible, like in VMs
 #      psu.energy.ac.sdia.machine.provider.PsuEnergyAcSdiaMachineProvider:
-#        sampling_rate: 99
       #-- This is a default configuration. Please change this to your system!
 #        CPUChips: 1
 #        TDP: 65
 #      psu.energy.ac.xgboost.machine.provider.PsuEnergyAcXgboostMachineProvider:
-#        sampling_rate: 99
       #-- This is a default configuration. Please change this to your system!
 #        CPUChips: 1
 #        HW_CPUFreq: 3200

metric_providers/psu/energy/ac/sdia/machine/provider.py

@@ -4,11 +4,11 @@
 from lib.global_config import GlobalConfig
 
 class PsuEnergyAcSdiaMachineProvider(BaseMetricProvider):
-    def __init__(self, *, sampling_rate, CPUChips, TDP, skip_check=False, filename=None):
+    def __init__(self, *, CPUChips, TDP, skip_check=False, filename=None):
         super().__init__(
             metric_name='psu_energy_ac_sdia_machine',
             metrics={'time': int, 'value': int},
-            sampling_rate=sampling_rate,
+            sampling_rate=-1,
             unit='uJ',
             current_dir=os.path.dirname(os.path.abspath(__file__)),
             skip_check=skip_check,
@@ -70,6 +70,10 @@ def _read_metrics(self):
     def _check_resolution_underflow(self, df):
         pass
 
+    # Provider does not sample on it's own and thus does not have to be checked
+    def _add_and_validate_sampling_rate_and_jitter(self, df):
+        return df
+
     def _parse_metrics(self, df):
         df = super()._parse_metrics(df)
 

metric_providers/psu/energy/ac/xgboost/machine/provider.py

@@ -10,12 +10,12 @@
 from lib.global_config import GlobalConfig
 
 class PsuEnergyAcXgboostMachineProvider(BaseMetricProvider):
-    def __init__(self, sampling_rate, *, HW_CPUFreq, CPUChips, CPUThreads, TDP,
+    def __init__(self, *, HW_CPUFreq, CPUChips, CPUThreads, TDP,
                  HW_MemAmountGB, CPUCores=None, Hardware_Availability_Year=None, VHost_Ratio=1, skip_check=False, filename=None):
         super().__init__(
             metric_name="psu_energy_ac_xgboost_machine",
             metrics={"time": int, "value": int},
-            sampling_rate=sampling_rate,
+            sampling_rate=-1,
             unit="uJ",
             current_dir=os.path.dirname(os.path.abspath(__file__)),
             skip_check=skip_check,
@@ -65,6 +65,10 @@ def _read_metrics(self):
     def _check_resolution_underflow(self, df):
         pass
 
+    # Provider does not sample on it's own and thus does not have to be checked
+    def _add_and_validate_sampling_rate_and_jitter(self, df):
+        return df
+
     def _parse_metrics(self, df):
 
         df = super()._parse_metrics(df)