Simplify and unify loop_through_keys helper

Author: NelsonVides

rebar.config

@@ -20,7 +20,7 @@
 ]}.
 
 {deps, [
-    {ddskerl, "0.3.0"}
+    {ddskerl, "0.4.1"}
 ]}.
 {shell, [{apps, [prometheus]}]}.
 

rebar.lock

@@ -1,8 +1,8 @@
 {"1.2.0",
-[{<<"ddskerl">>,{pkg,<<"ddskerl">>,<<"0.3.0">>},0}]}.
+[{<<"ddskerl">>,{pkg,<<"ddskerl">>,<<"0.4.1">>},0}]}.
 [
 {pkg_hash,[
- {<<"ddskerl">>, <<"4CAFDE08B988CF0A103E1189915F2265F06F73589BD1CFA1BE18D7A74F6D23A8">>}]},
+ {<<"ddskerl">>, <<"F0329E1F8FD3C6209F1645B540F6D4FC14C60B897B05E65B8A4122A362EF019A">>}]},
 {pkg_hash_ext,[
- {<<"ddskerl">>, <<"E779B1CE036A3FE15066F82193F47D87AEB01EC095DBCE2FB821BCD6117BDBBD">>}]}
+ {<<"ddskerl">>, <<"0B68A1E53AF4CCF5F43D70F8EABA1F031388B3FCBD6405FA0CDF849FB47F1811">>}]}
 ].

src/metrics/prometheus_quantile_summary.erl

@@ -321,28 +321,29 @@ value(Registry, Name, LabelValues) ->
         true ->
             DU = prometheus_metric:mf_duration_unit(MF),
             #{quantiles := QNs} = prometheus_metric:mf_data(MF),
-            Total = make_ref(),
-            insert_metric(Registry, Name, LabelValues, Total),
-            [
-                catch ddskerl_ets:merge(?TABLE, Total, ?TABLE, {Registry, Name, LabelValues, SId})
-             || SId <- schedulers_seq()
-            ],
-            case ddskerl_ets:total(?TABLE, Total) of
+            [First | Rest] = lists:flatmap(
+                fun(SId) ->
+                    ets:lookup(?TABLE, {Registry, Name, LabelValues, SId})
+                end,
+                schedulers_seq()
+            ),
+            Total = lists:foldl(
+                fun(Elem, Acc) -> ddskerl_ets:merge_tuples(Acc, Elem) end, First, Rest
+            ),
+            case ddskerl_ets:total_tuple(Total) of
                 0 ->
-                    ets:delete(?TABLE, Total),
                     {0, 0, []};
                 Count ->
-                    Sum = ddskerl_ets:sum(?TABLE, Total),
+                    Sum = ddskerl_ets:sum_tuple(Total),
                     DuSum = prometheus_time:maybe_convert_to_du(DU, Sum),
                     Values = [
                         {QN,
                             prometheus_time:maybe_convert_to_du(
                                 DU,
-                                ddskerl_ets:quantile(?TABLE, Total, QN)
+                                ddskerl_ets:quantile_tuple(Total, QN)
                             )}
                      || QN <- QNs
                     ],
-                    ets:delete(?TABLE, Total),
                     {Count, DuSum, Values}
             end
     end.
@@ -358,39 +359,12 @@ values(Registry, Name) ->
         false ->
             [];
         MF ->
-            DU = prometheus_metric:mf_duration_unit(MF),
             Labels = prometheus_metric:mf_labels(MF),
-            loop_through_keys(
-                Registry, Name, DU, Labels, sets:new([{version, 2}]), [], ets:first(?TABLE)
-            )
+            CLabels = prometheus_metric:mf_constant_labels(MF),
+            Fun = fun value_summary_metric/6,
+            loop_through_keys(Name, Fun, CLabels, Labels, Registry)
     end.
 
-loop_through_keys(_, _, _, _, _, Acc, '$end_of_table') ->
-    Acc;
-loop_through_keys(
-    Registry, Name, DU, Labels, Set, Acc, {Registry, Name, LabelValues, _} = CurrentKey
-) ->
-    Key = {Registry, Name, LabelValues},
-    case sets:is_element(Key, Set) of
-        true ->
-            NextKey = ets:next(?TABLE, CurrentKey),
-            loop_through_keys(Registry, Name, DU, Labels, Set, Acc, NextKey);
-        false ->
-            {Count, Sum, QNs} = value(Registry, Name, LabelValues),
-            Value = {
-                lists:zip(Labels, LabelValues),
-                Count,
-                prometheus_time:maybe_convert_to_du(DU, Sum),
-                QNs
-            },
-            NextKey = ets:next(?TABLE, CurrentKey),
-            NewSet = sets:add_element(Key, Set),
-            loop_through_keys(Registry, Name, DU, Labels, NewSet, [Value | Acc], NextKey)
-    end;
-loop_through_keys(Registry, Name, DU, Labels, Set, Acc, CurrentKey) ->
-    NextKey = ets:next(?TABLE, CurrentKey),
-    loop_through_keys(Registry, Name, DU, Labels, Set, Acc, NextKey).
-
 %%====================================================================
 %% Collector API
 %%====================================================================
@@ -415,33 +389,43 @@ collect_mf(Registry, Callback) ->
 ?DOC(false).
 -spec collect_metrics(prometheus_metric:name(), tuple()) ->
     [prometheus_model:'Metric'()].
-collect_metrics(Name, {CLabels, Labels, Registry, DU, _Configuration}) ->
-    loop_through_keys(
-        Name, CLabels, Labels, Registry, DU, sets:new([{version, 2}]), [], ets:first(?TABLE)
-    ).
+collect_metrics(Name, {CLabels, Labels, Registry, _DU, _Configuration}) ->
+    Fun = fun model_summary_metric/6,
+    loop_through_keys(Name, Fun, CLabels, Labels, Registry).
+
+loop_through_keys(Name, Fun, CLabels, Labels, Registry) ->
+    Sets = sets:new([{version, 2}]),
+    First = ets:first(?TABLE),
+    loop_through_keys(Name, Fun, CLabels, Labels, Registry, Sets, [], First).
 
 loop_through_keys(_, _, _, _, _, _, Acc, '$end_of_table') ->
     Acc;
 loop_through_keys(
-    Name, CLabels, Labels, Registry, DU, Set, Acc, {Registry, Name, LabelValues, _} = CurrentKey
+    Name, Fun, CLabels, Labels, Registry, Set, Acc, {Registry, Name, LabelValues, _} = CurrentKey
 ) ->
     Key = {Registry, Name, LabelValues},
     case sets:is_element(Key, Set) of
         true ->
             NextKey = ets:next(?TABLE, CurrentKey),
-            loop_through_keys(Name, CLabels, Labels, Registry, DU, Set, Acc, NextKey);
+            loop_through_keys(Name, Fun, CLabels, Labels, Registry, Set, Acc, NextKey);
         false ->
             {Count, Sum, QNs} = value(Registry, Name, LabelValues),
-            Value = prometheus_model_helpers:summary_metric(
-                CLabels ++ lists:zip(Labels, LabelValues), Count, Sum, QNs
-            ),
-            NextKey = ets:next(?TABLE, CurrentKey),
+            Value = Fun(CLabels, Labels, LabelValues, Count, Sum, QNs),
+            NewAcc = [Value | Acc],
             NewSet = sets:add_element(Key, Set),
-            loop_through_keys(Name, CLabels, Labels, Registry, DU, NewSet, [Value | Acc], NextKey)
+            NextKey = ets:next(?TABLE, CurrentKey),
+            loop_through_keys(Name, Fun, CLabels, Labels, Registry, NewSet, NewAcc, NextKey)
     end;
-loop_through_keys(Name, CLabels, Labels, Registry, DU, Set, Acc, CurrentKey) ->
+loop_through_keys(Name, Fun, CLabels, Labels, Registry, Set, Acc, CurrentKey) ->
     NextKey = ets:next(?TABLE, CurrentKey),
-    loop_through_keys(Name, CLabels, Labels, Registry, DU, Set, Acc, NextKey).
+    loop_through_keys(Name, Fun, CLabels, Labels, Registry, Set, Acc, NextKey).
+
+model_summary_metric(CLabels, Labels, LabelValues, Count, Sum, QNs) ->
+    Labs = CLabels ++ lists:zip(Labels, LabelValues),
+    prometheus_model_helpers:summary_metric(Labs, Count, Sum, QNs).
+
+value_summary_metric(_CLabels, Labels, LabelValues, Count, Sum, QNs) ->
+    {lists:zip(Labels, LabelValues), Count, Sum, QNs}.
 
 %%====================================================================
 %% Private Parts