Refactor aggregation code for :all

Signed-off-by: Chris Sinjakli <[email protected]>

Author: Chris Sinjakli

lib/prometheus/client/data_stores/direct_file_store.rb

@@ -133,17 +133,9 @@ def all_values
               end
             end
 
-            if @values_aggregation_mode == ALL
-              stores_data.each do |label_set, values|
-                stores_data[label_set] = values.first
-              end
-
-              stores_data
-            else
-              # Aggregate all the different values for each label_set
-              stores_data.each_with_object({}) do |(label_set, values), acc|
-                acc[label_set] = aggregate_values(values)
-              end
+            # Aggregate all the different values for each label_set
+            stores_data.each_with_object({}) do |(label_set, values), acc|
+              acc[label_set] = aggregate_values(values)
             end
           end
 
@@ -182,6 +174,8 @@ def aggregate_values(values)
               values.max
             elsif @values_aggregation_mode == MIN
               values.min
+            elsif @values_aggregation_mode == ALL
+              values.first
             else
               raise InvalidStoreSettingsError,
                     "Invalid Aggregation Mode: #{ @values_aggregation_mode }"