Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ jobs:
name: OTP ${{matrix.otp_vsn}}
strategy:
matrix:
otp_vsn: ['27']
rebar_vsn: ['3.24.0']
otp_vsn: ['28', '27']
rebar_vsn: ['3.25']
runs-on: 'ubuntu-24.04'
steps:
- uses: actions/checkout@v4
Expand All @@ -33,8 +33,8 @@ jobs:
name: docker container test with OTP ${{matrix.otp_vsn}}
strategy:
matrix:
otp_vsn: ['27']
rebar_vsn: ['3.24.0']
otp_vsn: ['28', '27']
rebar_vsn: ['3.25']
runs-on: 'ubuntu-24.04'
env:
OTP_RELEASE: ${{ matrix.otp_vsn }}
Expand All @@ -57,7 +57,7 @@ jobs:
- integration_test
if: github.ref == 'refs/heads/master'
env:
OTP_RELEASE: 27.1
OTP_RELEASE: 27.3
steps:
- uses: actions/checkout@v4
- name: Set up QEMU
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG otp_vsn=27.1
ARG otp_vsn=27.3
FROM erlang:${otp_vsn} AS builder
LABEL org.label-schema.name='AMOC Arsenal' \
org.label-schema.vendor='Erlang Solutions'
Expand Down
2 changes: 1 addition & 1 deletion ci/build_and_push_docker_image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
set -euo pipefail
IFS=$'\n\t'

export otp_vsn="${OTP_RELEASE:-27.1}"
export otp_vsn="${OTP_RELEASE:-27.3}"
echo "ERLANG/OTP ${otp_vsn}"

docker buildx build --platform linux/amd64,linux/arm64 \
Expand Down
2 changes: 1 addition & 1 deletion ci/build_docker_image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ IFS=$'\n\t'

# Get current repo version
version="$(git rev-parse --short HEAD)"
otp_vsn="${OTP_RELEASE:-27.1}"
otp_vsn="${OTP_RELEASE:-27.3}"
echo "ERLANG/OTP ${otp_vsn}"
echo "AMOC-ARSENAL-XMPP ${version}"

Expand Down
12 changes: 8 additions & 4 deletions rebar.config
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,14 @@

{ deps, [
{amoc_arsenal, {git, "https://github.com/esl/amoc-arsenal.git", {branch, "main"}}},
{escalus, "4.4.0"},
{exml, "~> 4.0", {pkg, hexml}},
{gun, "2.1.0"},
{fusco, "0.1.1"}
{escalus, "~> 4.5"},
{exml, "~> 4.1", {pkg, hexml}},
{gun, "~> 2.2"},
{fusco, "~> 0.1"}
]}.

{ overrides, [
{override, gun, [{deps, [{cowlib, "~> 2.15"}]}]}
]}.

{ shell, [
Expand Down
74 changes: 37 additions & 37 deletions rebar.lock
Original file line number Diff line number Diff line change
@@ -1,76 +1,76 @@
{"1.2.0",
[{<<"accept">>,{pkg,<<"accept">>,<<"0.3.5">>},3},
{<<"amoc">>,{pkg,<<"amoc">>,<<"3.3.0">>},1},
[{<<"accept">>,{pkg,<<"accept">>,<<"0.3.7">>},3},
{<<"amoc">>,{pkg,<<"amoc">>,<<"4.0.0">>},1},
{<<"amoc_arsenal">>,
{git,"https://github.com/esl/amoc-arsenal.git",
{ref,"5e2140ff8c11295a45ff8a555444baf7d0ebab27"}},
{ref,"13c7160ee238dea1152da28501f3d21297f62160"}},
0},
{<<"amoc_rest">>,
{git,"https://github.com/esl/amoc_rest.git",
{ref,"d9f642255f48d14a1ff9601500796f5edb4e11e6"}},
1},
{<<"bbmustache">>,{pkg,<<"bbmustache">>,<<"1.12.2">>},1},
{<<"cowboy">>,{pkg,<<"cowboy">>,<<"2.12.0">>},2},
{<<"cowlib">>,{pkg,<<"cowlib">>,<<"2.13.0">>},1},
{<<"escalus">>,{pkg,<<"escalus">>,<<"4.4.0">>},0},
{<<"exml">>,{pkg,<<"hexml">>,<<"4.1.1">>},0},
{<<"fast_pbkdf2">>,{pkg,<<"fast_pbkdf2">>,<<"1.0.6">>},2},
{<<"fast_scram">>,{pkg,<<"fast_scram">>,<<"0.6.1">>},1},
{<<"cowlib">>,{pkg,<<"cowlib">>,<<"2.15.0">>},1},
{<<"escalus">>,{pkg,<<"escalus">>,<<"4.5.2">>},0},
{<<"exml">>,{pkg,<<"hexml">>,<<"4.1.2">>},0},
{<<"fast_pbkdf2">>,{pkg,<<"fast_pbkdf2">>,<<"2.0.0">>},2},
{<<"fast_scram">>,{pkg,<<"fast_scram">>,<<"0.7.0">>},1},
{<<"fusco">>,{pkg,<<"fusco">>,<<"0.1.1">>},0},
{<<"gun">>,{pkg,<<"gun">>,<<"2.1.0">>},0},
{<<"gun">>,{pkg,<<"gun">>,<<"2.2.0">>},0},
{<<"jesse">>,{pkg,<<"jesse">>,<<"1.8.1">>},2},
{<<"meck">>,{pkg,<<"meck">>,<<"1.0.0">>},1},
{<<"prometheus">>,{pkg,<<"prometheus">>,<<"4.11.0">>},1},
{<<"prometheus_cowboy">>,{pkg,<<"prometheus_cowboy">>,<<"0.1.8">>},1},
{<<"prometheus_httpd">>,{pkg,<<"prometheus_httpd">>,<<"2.1.11">>},2},
{<<"quantile_estimator">>,{pkg,<<"quantile_estimator">>,<<"0.2.1">>},2},
{<<"prometheus">>,{pkg,<<"prometheus">>,<<"5.0.0">>},1},
{<<"prometheus_cowboy">>,{pkg,<<"prometheus_cowboy">>,<<"0.2.0">>},1},
{<<"prometheus_httpd">>,{pkg,<<"prometheus_httpd">>,<<"2.1.15">>},2},
{<<"quantile_estimator">>,{pkg,<<"quantile_estimator">>,<<"1.0.2">>},2},
{<<"quickrand">>,{pkg,<<"quickrand">>,<<"2.0.7">>},2},
{<<"ranch">>,{pkg,<<"ranch">>,<<"2.1.0">>},2},
{<<"telemetry">>,{pkg,<<"telemetry">>,<<"1.3.0">>},1},
{<<"uuid">>,{pkg,<<"uuid_erl">>,<<"2.0.7">>},1},
{<<"worker_pool">>,{pkg,<<"worker_pool">>,<<"6.4.0">>},1}]}.
[
{pkg_hash,[
{<<"accept">>, <<"B33B127ABCA7CC948BBE6CAA4C263369ABF1347CFA9D8E699C6D214660F10CD1">>},
{<<"amoc">>, <<"531B7E8CE39D40B4BF5A819868091C4451DC3D3FDAE753E3E3B1D0E5E8E81CDD">>},
{<<"accept">>, <<"CD6E34A2D7E28CA38B2D3CB233734CA0C221EFBC1F171F91FEC5F162CC2D18DA">>},
{<<"amoc">>, <<"BBE86809FD89E6441BAE4DB26C13232CD9128897D1D3F1ACD1D6854F02ECEC94">>},
{<<"bbmustache">>, <<"0CABDCE0DB9FE6D3318131174B9F2B351328A4C0AFBEB3E6E99BB0E02E9B621D">>},
{<<"cowboy">>, <<"F276D521A1FF88B2B9B4C54D0E753DA6C66DD7BE6C9FCA3D9418B561828A3731">>},
{<<"cowlib">>, <<"DB8F7505D8332D98EF50A3EF34B34C1AFDDEC7506E4EE4DD4A3A266285D282CA">>},
{<<"escalus">>, <<"EBD887FA44FB64484DB17AAC42D694E223DB932B54B47C6F8E24A0CFA67AFCD0">>},
{<<"exml">>, <<"D46272177F3B779D75058005C744997034823AB3A237F9B30B56A583B063FDE3">>},
{<<"fast_pbkdf2">>, <<"199BCEC73A1A246941E9465D3DC41052953B638128841ED24B29ED03CF70AF27">>},
{<<"fast_scram">>, <<"BEEADB03D774640F0671681759CE53B2FF33CB58C86FD9BF2A793E2FC1ED0F5D">>},
{<<"cowlib">>, <<"3C97A318A933962D1C12B96AB7C1D728267D2C523C25A5B57B0F93392B6E9E25">>},
{<<"escalus">>, <<"E25336C0C9F30A9DCB32590204D4A58357CCE127EB7D64311C514B8F97369FDB">>},
{<<"exml">>, <<"4EA6B95AF18922F94FD67BBDEAA325A75CCE04487083C786E7417BA862D590E5">>},
{<<"fast_pbkdf2">>, <<"72CDEE3C10C6B9B40E31194DE946A883CEEF6CF1F37D7FC9FD1A9D87502723F5">>},
{<<"fast_scram">>, <<"FAD4DD185E0DEFA34B0E30654AB0CC4048E9324BCF65BB261E0A86BF3C604F9F">>},
{<<"fusco">>, <<"3DD6A90151DFEF30EA1937CC44E9A59177C0094918388D9BCAA2F2DC5E2AE4AA">>},
{<<"gun">>, <<"B4E4CBBF3026D21981C447E9E7CA856766046EFF693720BA43114D7F5DE36E87">>},
{<<"gun">>, <<"B8F6B7D417E277D4C2B0DC3C07DFDF892447B087F1CC1CAFF9C0F556B884E33D">>},
{<<"jesse">>, <<"C9E3670C7EE40F719734E3BC716578143AABA93FC7525A02A7D5CB300B3AD71E">>},
{<<"meck">>, <<"24676CB6EE6951530093A93EDCD410CFE4CB59FE89444B875D35C9D3909A15D0">>},
{<<"prometheus">>, <<"B95F8DE8530F541BD95951E18E355A840003672E5EDA4788C5FA6183406BA29A">>},
{<<"prometheus_cowboy">>, <<"CFCE0BC7B668C5096639084FCD873826E6220EA714BF60A716F5BD080EF2A99C">>},
{<<"prometheus_httpd">>, <<"F616ED9B85B536B195D94104063025A91F904A4CFC20255363F49A197D96C896">>},
{<<"quantile_estimator">>, <<"EF50A361F11B5F26B5F16D0696E46A9E4661756492C981F7B2229EF42FF1CD15">>},
{<<"prometheus">>, <<"8A37A3216D8DB019D19068602669C9819C099120F8E39994DD1BD3A3F5553376">>},
{<<"prometheus_cowboy">>, <<"526F75D9850A9125496F78BCEECCA0F237BC7B403C976D44508543AE5967DAD9">>},
{<<"prometheus_httpd">>, <<"8F767D819A5D36275EAB9264AFF40D87279151646776069BF69FBDBBD562BD75">>},
{<<"quantile_estimator">>, <<"ECD281D40110FDD9BA62685531E4435E0839A52FD1058DA5564F1763E4642EF7">>},
{<<"quickrand">>, <<"D2BD76676A446E6A058D678444B7FDA1387B813710D1AF6D6E29BB92186C8820">>},
{<<"ranch">>, <<"2261F9ED9574DCFCC444106B9F6DA155E6E540B2F82BA3D42B339B93673B72A3">>},
{<<"telemetry">>, <<"FEDEBBAE410D715CF8E7062C96A1EF32EC22E764197F70CDA73D82778D61E7A2">>},
{<<"uuid">>, <<"B2078D2CC814F53AFA52D36C91E08962C7E7373585C623F4C0EA6DFB04B2AF94">>},
{<<"worker_pool">>, <<"0347B805A8E5804B5676A9885FB3B9B6C1627099C449C3C67C0E8E6AF79E9AA6">>}]},
{pkg_hash_ext,[
{<<"accept">>, <<"11B18C220BCC2EAB63B5470C038EF10EB6783BCB1FCDB11AA4137DEFA5AC1BB8">>},
{<<"amoc">>, <<"B8DD4F77BB94716ABC64E863158EEF8E1375CECB2F69E57DC4A293B0949D4985">>},
{<<"accept">>, <<"CA69388943F5DAD2E7232A5478F16086E3C872F48E32B88B378E1885A59F5649">>},
{<<"amoc">>, <<"059B9052917A3E691A67FDC4E143CE3DBCD2C4076573D347D1B0D3CADAB603DC">>},
{<<"bbmustache">>, <<"688B33A4D5CC2D51F575ADF0B3683FC40A38314A2F150906EDCFC77F5B577B3B">>},
{<<"cowboy">>, <<"8A7ABE6D183372CEB21CAA2709BEC928AB2B72E18A3911AA1771639BEF82651E">>},
{<<"cowlib">>, <<"E1E1284DC3FC030A64B1AD0D8382AE7E99DA46C3246B815318A4B848873800A4">>},
{<<"escalus">>, <<"370F55B3104DAD8FC2756BA7EB86BCA98684DFF712155E624EA6F00B829C58C3">>},
{<<"exml">>, <<"86C154396A9B21EEB0EDB9636D0E2D493FE0F59EAAF40FCFE795210F31119D8F">>},
{<<"fast_pbkdf2">>, <<"35EEC22629AAA739915843C7B7DE0D84657D1ECE972D8BBC86368747E9C14012">>},
{<<"fast_scram">>, <<"FE0650A309FDF97C75E1EA812CCFB40EB464ECAFD3783E83AA17C7F572EDAB0B">>},
{<<"cowlib">>, <<"4F00C879A64B4FE7C8FCB42A4281925E9FFDB928820B03C3AD325A617E857532">>},
{<<"escalus">>, <<"12B3C31D93C12656C04A0DE2BB945B803EE6D48F6433065E7B6860A6C8056C35">>},
{<<"exml">>, <<"03883AE3E27970E9DAC204B27CE330B54A6C2772455E43FE2319349DFF40B1DC">>},
{<<"fast_pbkdf2">>, <<"74159FD09FB8BF5E97D25137C6C83C28E2CF7E97D7C127D83310DFD0904BD732">>},
{<<"fast_scram">>, <<"39CB1D4C91C99E637E000A3864D274D8A9CB43D86EEC2495FE9546798DBFA015">>},
{<<"fusco">>, <<"6343551BD1E824F2A6CA85E1158C5B37C320FD449FBFEC7450A73F192AAF9022">>},
{<<"gun">>, <<"52FC7FC246BFC3B00E01AEA1C2854C70A366348574AB50C57DFE796D24A0101D">>},
{<<"gun">>, <<"76022700C64287FEB4DF93A1795CFF6741B83FB37415C40C34C38D2A4645261A">>},
{<<"jesse">>, <<"0EDED3F18623FDA2F25989804A06CF518B4ACF2E9365B18C8E8C013D7E3C906F">>},
{<<"meck">>, <<"680A9BCFE52764350BEB9FB0335FB75FEE8E7329821416CEE0A19FEC35433882">>},
{<<"prometheus">>, <<"719862351AABF4DF7079B05DC085D2BBCBE3AC0AC3009E956671B1D5AB88247D">>},
{<<"prometheus_cowboy">>, <<"BA286BECA9302618418892D37BCD5DC669A6CC001F4EB6D6AF85FF81F3F4F34C">>},
{<<"prometheus_httpd">>, <<"0BBE831452CFDF9588538EB2F570B26F30C348ADAE5E95A7D87F35A5910BCF92">>},
{<<"quantile_estimator">>, <<"282A8A323CA2A845C9E6F787D166348F776C1D4A41EDE63046D72D422E3DA946">>},
{<<"prometheus">>, <<"80D29564A5DC4490B53FD225D752B65FB0DBEBA41497F96D62223338127C5659">>},
{<<"prometheus_cowboy">>, <<"2C7EB12F4B970D91E3B47BAAD0F138F6ADC34E53EEB0AE18068FF0AFAB441B24">>},
{<<"prometheus_httpd">>, <<"67736D000745184D5013C58A63E947821AB90CB9320BC2E6AE5D3061C6FFE039">>},
{<<"quantile_estimator">>, <<"DB404793D6384995A1AC6DD973E2CEE5BE9FCC128765BDBA53D87C564E296B64">>},
{<<"quickrand">>, <<"B8ACBF89A224BC217C3070CA8BEBC6EB236DBE7F9767993B274084EA044D35F0">>},
{<<"ranch">>, <<"244EE3FA2A6175270D8E1FC59024FD9DBC76294A321057DE8F803B1479E76916">>},
{<<"telemetry">>, <<"7015FC8919DBE63764F4B4B87A95B7C0996BD539E0D499BE6EC9D7F3875B79E6">>},
Expand Down
2 changes: 1 addition & 1 deletion src/helpers/amoc_xmpp_muc.erl
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
description => "Number of users each room has"}
]).

-spec init() -> ok.
-spec init() -> boolean().
init() ->
amoc_metrics:init(counters, muc_rooms_created),
amoc_metrics:init(times, room_creation_response_time).
Expand Down
2 changes: 1 addition & 1 deletion src/scenarios/mongoose_muc.erl
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ init() ->
amoc_metrics:init(times, muc_message_ttd),
ok.

-spec start(amoc_scenario:user_id()) -> any().
-spec start(amoc_scenario:user_id()) -> no_return().
start(Id) ->
{ok, Client, _Spec} = amoc_xmpp:connect_or_exit(Id, extra_user_spec()),
send_presence_available(Client),
Expand Down
2 changes: 1 addition & 1 deletion src/scenarios/mongoose_muc_light.erl
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ init() ->
amoc_metrics:init(times, muc_message_ttd),
ok.

-spec start(amoc_scenario:user_id()) -> any().
-spec start(amoc_scenario:user_id()) -> no_return().
start(Id) ->
{ok, Client, _Spec} = amoc_xmpp:connect_or_exit(Id, extra_user_spec()),
send_presence_available(Client),
Expand Down