Skip to content

Commit 27ebf45

Browse files
NelsonVidesNelsonVides
authored
Upgrade dependencies and runtimes (#199)
1 parent 6610f1a commit 27ebf45

4 files changed

Lines changed: 65 additions & 82 deletions

File tree

‎.github/workflows/main.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ jobs:
1515
strategy:
1616
matrix:
1717
otp: ['28', '27', '26']
18-
rebar3: ['3.25']
18+
rebar3: ['3.27']
1919
runs-on: 'ubuntu-24.04'
2020
steps:
21-
- uses: actions/checkout@v4
21+
- uses: actions/checkout@v6
2222
- uses: erlef/setup-beam@v1
2323
with:
2424
otp-version: ${{matrix.otp}}
@@ -46,7 +46,7 @@ jobs:
4646
name: promtool
4747
runs-on: 'ubuntu-24.04'
4848
steps:
49-
- uses: actions/setup-go@v5
49+
- uses: actions/setup-go@v6
5050
with:
5151
go-version: 'stable'
5252
- run: |
@@ -70,11 +70,11 @@ jobs:
7070
# Delete downloaded files
7171
rm -rf prometheus-$VERSION.$ARCH
7272
rm -rf prometheus-$VERSION.$ARCH.tar.gz
73-
- uses: actions/checkout@v4
73+
- uses: actions/checkout@v6
7474
- uses: erlef/setup-beam@v1
7575
with:
7676
otp-version: '28'
77-
rebar3-version: '3.25'
77+
rebar3-version: '3.27'
7878
- run: rebar3 compile
7979
- run: |
8080
set -e

‎.github/workflows/release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ jobs:
99
release:
1010
runs-on: ubuntu-latest
1111
container:
12-
image: erlang:27
12+
image: erlang:28
1313
permissions:
1414
contents: write
1515
steps:
1616
- name: Checkout
17-
uses: actions/checkout@v4
17+
uses: actions/checkout@v6
1818

1919
- run: chown --recursive --reference=/ .
2020
- run: git config --global --add safe.directory '*'

‎rebar.config‎

Lines changed: 50 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,10 @@
7575
]}.
7676

7777
{project_plugins, [
78-
{rebar3_hex, "~> 7.0"},
79-
{rebar3_lint, "~> 4.1"},
78+
{rebar3_hex, "~> 7.1"},
79+
{rebar3_lint, "~> 5.0"},
8080
{rebar3_ex_doc, "~> 0.2"},
81-
{erlfmt, "~> 1.7"},
81+
{erlfmt, "~> 1.8"},
8282
{covertool, "~> 2.0"}
8383
]}.
8484

@@ -109,64 +109,51 @@
109109
]}.
110110

111111
{elvis, [
112-
#{
113-
dirs => [
114-
"src",
115-
"src/collectors",
116-
"src/collectors/vm",
117-
"src/contrib",
118-
"src/formats",
119-
"src/metrics"
120-
],
121-
filter => "*.erl",
122-
rules => [
123-
{elvis_text_style, line_length, #{limit => 120, skip_comments => false}},
124-
{elvis_style, consistent_generic_type, #{preferred_type => term}},
125-
{elvis_style, invalid_dynamic_call, #{
126-
ignore => [
127-
prometheus_misc,
128-
prometheus_registry,
129-
prometheus_sup
130-
]
131-
}},
132-
{elvis_style, god_modules, #{limit => 40}},
133-
{elvis_style, dont_repeat_yourself, #{min_complexity => 15}},
134-
{elvis_style, no_catch_expressions, disable}
135-
],
136-
ruleset => erl_files
137-
},
138-
#{
139-
dirs => ["src/model"],
140-
filter => "prometheus_model_helpers.erl",
141-
rules => [
142-
{elvis_text_style, line_length, #{limit => 120}},
143-
{elvis_style, invalid_dynamic_call, #{
144-
ignore => [
145-
%% FIXME: why create_mf calls collect_metrics??
146-
prometheus_model_helpers
147-
]
148-
}},
149-
{elvis_style, god_modules, #{limit => 40}}
150-
],
151-
ruleset => erl_files
152-
},
153-
#{
154-
dirs => ["test/eunit", "test/eunit/format", "test/eunit/contrib", "test/eunit/metric"],
155-
filter => "*.erl",
156-
rules => [
157-
{elvis_text_style, line_length, #{limit => 120}},
158-
{elvis_style, invalid_dynamic_call, #{ignore => []}},
159-
{elvis_style, god_modules, #{limit => 40}},
160-
%% looks like eunit generates underscored vars
161-
{elvis_style, variable_naming_convention, #{regex => "^([A-Z_][0-9a-zA-Z_]*)$"}},
162-
{elvis_style, dont_repeat_yourself, #{min_complexity => 200}},
163-
{elvis_style, no_block_expressions, disable}
164-
],
165-
ruleset => erl_files
166-
},
167-
#{
168-
dirs => ["."],
169-
filter => "rebar.config",
170-
ruleset => rebar_config
171-
}
112+
{config, [
113+
#{
114+
files => ["src/**/*.erl"],
115+
ignore => ["src/model/"],
116+
rules => [
117+
{elvis_text_style, max_line_length, #{limit => 120, skip_comments => false}},
118+
{elvis_style, dont_repeat_yourself, #{min_complexity => 15}},
119+
{elvis_style, generic_type, #{preferred_type => term}},
120+
{elvis_style, no_invalid_dynamic_calls, #{
121+
ignore => [
122+
prometheus_misc,
123+
prometheus_registry,
124+
prometheus_sup
125+
]
126+
}},
127+
{elvis_style, no_god_modules, #{limit => 40}},
128+
{elvis_style, no_catch_expressions, disable}
129+
],
130+
ruleset => erl_files
131+
},
132+
#{
133+
files => ["src/model/prometheus_model_helpers.erl"],
134+
rules => [
135+
{elvis_text_style, max_line_length, #{limit => 120}},
136+
%% FIXME: why create_mf calls collect_metrics??
137+
{elvis_style, no_invalid_dynamic_calls, disable},
138+
{elvis_style, no_god_modules, #{limit => 40}}
139+
],
140+
ruleset => erl_files
141+
},
142+
#{
143+
files => ["test/eunit/**/*.erl"],
144+
rules => [
145+
{elvis_text_style, max_line_length, #{limit => 120}},
146+
{elvis_style, no_god_modules, #{limit => 40}},
147+
%% looks like eunit generates underscored vars
148+
{elvis_style, variable_naming_convention, #{regex => "^([A-Z_][0-9a-zA-Z_]*)$"}},
149+
{elvis_style, dont_repeat_yourself, #{min_complexity => 200}},
150+
{elvis_style, no_block_expressions, disable}
151+
],
152+
ruleset => erl_files
153+
},
154+
#{
155+
files => ["rebar.config"],
156+
ruleset => rebar_config
157+
}
158+
]}
172159
]}.

‎src/collectors/mnesia/prometheus_mnesia_collector.erl‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,6 @@ By default all metrics are enabled.
6767

6868
-export([deregister_cleanup/1, collect_mf/2]).
6969

70-
-import(prometheus_model_helpers, [create_mf/4]).
71-
7270
-include("prometheus.hrl").
7371

7472
-behaviour(prometheus_collector).
@@ -99,7 +97,9 @@ collect_mf(_Registry, Callback) ->
9997
ok.
10098

10199
add_metric_family({Name, Type, Help, Metrics}, Callback) ->
102-
Callback(create_mf(?METRIC_NAME(Name), Help, Type, catch_all(Metrics))).
100+
Callback(
101+
prometheus_model_helpers:create_mf(?METRIC_NAME(Name), Help, Type, catch_all(Metrics))
102+
).
103103

104104
%%====================================================================
105105
%% Private Parts
@@ -131,15 +131,11 @@ metrics(EnabledMetrics) ->
131131
{restarted_transactions_total, counter, "Total number of transaction restarts.", fun() ->
132132
mnesia:system_info(transaction_restarts)
133133
end},
134-
{memory_usage_bytes, gauge, "Total number of bytes allocated by all mnesia tables", fun() ->
135-
get_memory_usage()
136-
end},
137-
{tablewise_memory_usage_bytes, gauge, "Number of bytes allocated per mnesia table", fun() ->
138-
get_tablewise_memory_usage()
139-
end},
140-
{tablewise_size, gauge, "Number of rows present per table", fun() ->
141-
get_tablewise_size()
142-
end}
134+
{memory_usage_bytes, gauge, "Total number of bytes allocated by all mnesia tables",
135+
fun get_memory_usage/0},
136+
{tablewise_memory_usage_bytes, gauge, "Number of bytes allocated per mnesia table",
137+
fun get_tablewise_memory_usage/0},
138+
{tablewise_size, gauge, "Number of rows present per table", fun get_tablewise_size/0}
143139
].
144140

145141
%%====================================================================

0 commit comments

Comments
 (0)
⚡