Skip to content

Commit a1df6ff

Browse files
authored
Upgrade plugins and fix new linter errors (#185)
1 parent b89f97b commit a1df6ff

File tree

4 files changed

+25
-19
lines changed

4 files changed

+25
-19
lines changed

rebar.config

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,11 @@
7474
]}.
7575

7676
{project_plugins, [
77-
{rebar3_hex, "~> 7.0.8"},
78-
{rebar3_lint, "~> 3.2.6"},
79-
{rebar3_ex_doc, "~> 0.2.25"},
80-
{erlfmt, "~> 1.6.0"},
81-
{covertool, "~> 2.0.7"}
77+
{rebar3_hex, "~> 7.0"},
78+
{rebar3_lint, "~> 4.1"},
79+
{rebar3_ex_doc, "~> 0.2"},
80+
{erlfmt, "~> 1.7"},
81+
{covertool, "~> 2.0"}
8282
]}.
8383

8484
{hex, [{doc, #{provider => ex_doc}}]}.

src/collectors/vm/prometheus_vm_system_info_collector.erl

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -222,12 +222,12 @@ metric_enabled(Name, Metrics) ->
222222

223223
collect_allocator_metrics() ->
224224
Metrics = lists:flatten([
225-
collect_allocator_metrics_(Alloc, Instance, Info)
225+
collect_allocator_metrics_1(Alloc, Instance, Info)
226226
|| {{Alloc, Instance}, Info} <- allocators()
227227
]),
228228
prometheus_model_helpers:gauge_metrics(Metrics).
229229

230-
collect_allocator_metrics_(Alloc, Instance, Info) ->
230+
collect_allocator_metrics_1(Alloc, Instance, Info) ->
231231
[
232232
[
233233
allocator_metric(Alloc, Instance, Kind, Key, KindInfo)
@@ -248,17 +248,21 @@ allocator_metric(Alloc, Instance, Kind, Key, Values) ->
248248
}.
249249

250250
%% Originally copied from recon_alloc.
251+
%% versions is deleted because never really having come across a case where it was useful to know.
251252
allocators() ->
252253
Allocators = erlang:system_info(alloc_util_allocators),
253-
%% versions is deleted in order to allow the use of the orddict api,
254-
%% and never really having come across a case where it was useful to know.
255-
[
256-
{{A, N}, lists:sort(proplists:delete(versions, Props))}
257-
|| A <- Allocators,
258-
Allocs <- [erlang:system_info({allocator, A})],
259-
Allocs =/= false,
260-
{_, N, Props} <- Allocs
261-
].
254+
lists:flatmap(fun allocator/1, Allocators).
255+
256+
allocator(A) ->
257+
case erlang:system_info({allocator, A}) of
258+
false ->
259+
[];
260+
Allocs ->
261+
[
262+
{{A, N}, lists:sort(proplists:delete(versions, Props))}
263+
|| {_, N, Props} <- Allocs
264+
]
265+
end.
262266

263267
allocator_blocks_metric(Alloc, Instance, Kind, count, KindInfo) ->
264268
Count =

src/metrics/prometheus_boolean.erl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ Raises:
173173
Value :: prometheus:prometheus_boolean().
174174
set(Registry, Name, LabelValues, Value) ->
175175
Value1 = prometheus_model_helpers:boolean_value(Value),
176-
set_(Registry, Name, LabelValues, Value1).
176+
set_1(Registry, Name, LabelValues, Value1).
177177

178178
?DOC(#{equiv => toggle(default, Name, [])}).
179179
-spec toggle(prometheus_metric:name()) -> ok.
@@ -348,12 +348,12 @@ collect_metrics(Name, {CLabels, Labels, Registry}) ->
348348
deregister_select(Registry, Name) ->
349349
[{{{Registry, Name, '_'}, '_'}, [], [true]}].
350350

351-
set_(Registry, Name, LabelValues, Value) ->
351+
set_1(Registry, Name, LabelValues, Value) ->
352352
Key = {Registry, Name, LabelValues},
353353
Spec = {?BOOLEAN_POS, Value},
354354
case ets:update_element(?TABLE, Key, Spec) of
355355
false ->
356-
insert_metric(Registry, Name, LabelValues, Value, fun set_/4);
356+
insert_metric(Registry, Name, LabelValues, Value, fun set_1/4);
357357
true ->
358358
ok
359359
end.

test/eunit/metric/prometheus_quantile_summary_tests.erl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -478,4 +478,6 @@ collect_monitors([{Pid, Ref} | Monitors]) ->
478478
{'DOWN', Ref, process, Pid, Reason} ->
479479
?assertEqual(normal, Reason),
480480
collect_monitors(Monitors)
481+
after 5000 ->
482+
ct:fail("Tasks never finished in a reasonable amount of time")
481483
end.

0 commit comments

Comments
 (0)