From d62ceffbdb266bb4748bed34198e3575bba2dc73 Mon Sep 17 00:00:00 2001 From: Aleksey Kashapov Date: Tue, 21 May 2024 11:39:55 +0300 Subject: [PATCH] TD-906: Bumps valitydev/machinegun-proto@3decc8f (#16) * TD-906: Bumps valitydev/machinegun-proto@3decc8f * Temporarily disables codecov report upload --- .github/workflows/erlang-checks.yml | 3 ++- rebar.config | 8 +++++++ rebar.lock | 23 ++++++++++++++----- ...achinery_machine_unique_tag_mg_example.erl | 2 +- src/machinery_mg_schema.erl | 4 ++-- src/machinery_utils.erl | 2 +- test/machinery_call_SUITE.erl | 4 ++-- test/machinery_mg_modernizer_flow_SUITE.erl | 8 +++---- test/machinery_mg_schema_flow_SUITE.erl | 4 ++-- test/machinery_notify_SUITE.erl | 4 ++-- test/machinery_repair_SUITE.erl | 4 ++-- test/machinery_start_SUITE.erl | 4 ++-- test/machinery_timeout_SUITE.erl | 4 ++-- 13 files changed, 47 insertions(+), 27 deletions(-) diff --git a/.github/workflows/erlang-checks.yml b/.github/workflows/erlang-checks.yml index 4bb7abf..27a9c3b 100644 --- a/.github/workflows/erlang-checks.yml +++ b/.github/workflows/erlang-checks.yml @@ -30,10 +30,11 @@ jobs: run: name: Run checks needs: setup - uses: valitydev/erlang-workflows/.github/workflows/erlang-parallel-build.yml@v1.0.1 + uses: valitydev/erlang-workflows/.github/workflows/erlang-parallel-build.yml@v1.0.14 with: otp-version: ${{ needs.setup.outputs.otp-version }} rebar-version: ${{ needs.setup.outputs.rebar-version }} use-thrift: true thrift-version: ${{ needs.setup.outputs.thrift-version }} run-ct-with-compose: true + upload-coverage: false diff --git a/rebar.config b/rebar.config index 6e1e753..1007aa1 100644 --- a/rebar.config +++ b/rebar.config @@ -27,6 +27,7 @@ % Common project dependencies. {deps, [ {genlib, {git, "https://github.com/valitydev/genlib.git", {branch, "master"}}}, + {prometheus, "4.6.0"}, {woody, {git, "https://github.com/valitydev/woody_erlang.git", {branch, "master"}}}, {mg_proto, {git, "https://github.com/valitydev/machinegun-proto", {branch, "master"}}} ]}. @@ -70,3 +71,10 @@ "ct.coverdata" ]} ]}. + +%% NOTE +%% It is needed to use rebar3 lint plugin +{overrides, [ + {del, accept, [{plugins, [{rebar3_archive_plugin, "0.0.2"}]}]}, + {del, prometheus, [{plugins, [{rebar3_archive_plugin, "0.0.1"}]}]} +]}. diff --git a/rebar.lock b/rebar.lock index 8627ac2..c233b0e 100644 --- a/rebar.lock +++ b/rebar.lock @@ -5,7 +5,7 @@ {<<"cowlib">>,{pkg,<<"cowlib">>,<<"2.11.0">>},2}, {<<"genlib">>, {git,"https://github.com/valitydev/genlib.git", - {ref,"82c5ff3866e3019eb347c7f1d8f1f847bed28c10"}}, + {ref,"f6074551d6586998e91a97ea20acb47241254ff3"}}, 0}, {<<"gproc">>,{pkg,<<"gproc">>,<<"0.9.0">>},1}, {<<"hackney">>,{pkg,<<"hackney">>,<<"1.18.0">>},1}, @@ -13,16 +13,21 @@ {<<"metrics">>,{pkg,<<"metrics">>,<<"1.0.1">>},2}, {<<"mg_proto">>, {git,"https://github.com/valitydev/machinegun-proto", - {ref,"96f7f11b184c29d8b7e83cd7646f3f2c13662bda"}}, + {ref,"3decc8f8b13c9cd1701deab47781aacddd7dbc92"}}, 0}, {<<"mimerl">>,{pkg,<<"mimerl">>,<<"1.2.0">>},2}, + {<<"opentelemetry_api">>,{pkg,<<"opentelemetry_api">>,<<"1.2.1">>},1}, + {<<"opentelemetry_semantic_conventions">>, + {pkg,<<"opentelemetry_semantic_conventions">>,<<"0.2.0">>}, + 2}, {<<"parse_trans">>,{pkg,<<"parse_trans">>,<<"3.3.1">>},2}, + {<<"prometheus">>,{pkg,<<"prometheus">>,<<"4.6.0">>},0}, {<<"ranch">>,{pkg,<<"ranch">>,<<"1.8.0">>},2}, {<<"snowflake">>, {git,"https://github.com/valitydev/snowflake.git", {ref,"de159486ef40cec67074afe71882bdc7f7deab72"}}, 1}, - {<<"ssl_verify_fun">>,{pkg,<<"ssl_verify_fun">>,<<"1.1.6">>},2}, + {<<"ssl_verify_fun">>,{pkg,<<"ssl_verify_fun">>,<<"1.1.7">>},2}, {<<"thrift">>, {git,"https://github.com/valitydev/thrift_erlang.git", {ref,"c280ff266ae1c1906fb0dcee8320bb8d8a4a3c75"}}, @@ -30,7 +35,7 @@ {<<"unicode_util_compat">>,{pkg,<<"unicode_util_compat">>,<<"0.7.0">>},2}, {<<"woody">>, {git,"https://github.com/valitydev/woody_erlang.git", - {ref,"3ddacb9296691aa8ddad05498d1fd34b078eda75"}}, + {ref,"81219ba5408e1c67f5eaed3c7e566ede42da88d4"}}, 0}]}. [ {pkg_hash,[ @@ -43,9 +48,12 @@ {<<"idna">>, <<"8A63070E9F7D0C62EB9D9FCB360A7DE382448200FBBD1B106CC96D3D8099DF8D">>}, {<<"metrics">>, <<"25F094DEA2CDA98213CECC3AEFF09E940299D950904393B2A29D191C346A8486">>}, {<<"mimerl">>, <<"67E2D3F571088D5CFD3E550C383094B47159F3EEE8FFA08E64106CDF5E981BE3">>}, + {<<"opentelemetry_api">>, <<"7B69ED4F40025C005DE0B74FCE8C0549625D59CB4DF12D15C32FE6DC5076FF42">>}, + {<<"opentelemetry_semantic_conventions">>, <<"B67FE459C2938FCAB341CB0951C44860C62347C005ACE1B50F8402576F241435">>}, {<<"parse_trans">>, <<"16328AB840CC09919BD10DAB29E431DA3AF9E9E7E7E6F0089DD5A2D2820011D8">>}, + {<<"prometheus">>, <<"20510F381DB1CCAB818B4CF2FAC5FA6AB5CC91BC364A154399901C001465F46F">>}, {<<"ranch">>, <<"8C7A100A139FD57F17327B6413E4167AC559FBC04CA7448E9BE9057311597A1D">>}, - {<<"ssl_verify_fun">>, <<"CF344F5692C82D2CD7554F5EC8FD961548D4FD09E7D22F5B62482E5AEAEBD4B0">>}, + {<<"ssl_verify_fun">>, <<"354C321CF377240C7B8716899E182CE4890C5938111A1296ADD3EC74CF1715DF">>}, {<<"unicode_util_compat">>, <<"BC84380C9AB48177092F43AC89E4DFA2C6D62B40B8BD132B1059ECC7232F9A78">>}]}, {pkg_hash_ext,[ {<<"cache">>, <<"44516CE6FA03594D3A2AF025DD3A87BFE711000EB730219E1DDEFC816E0AA2F4">>}, @@ -57,8 +65,11 @@ {<<"idna">>, <<"92376EB7894412ED19AC475E4A86F7B413C1B9FBB5BD16DCCD57934157944CEA">>}, {<<"metrics">>, <<"69B09ADDDC4F74A40716AE54D140F93BEB0FB8978D8636EADED0C31B6F099F16">>}, {<<"mimerl">>, <<"F278585650AA581986264638EBF698F8BB19DF297F66AD91B18910DFC6E19323">>}, + {<<"opentelemetry_api">>, <<"6D7A27B7CAD2AD69A09CABF6670514CAFCEC717C8441BEB5C96322BAC3D05350">>}, + {<<"opentelemetry_semantic_conventions">>, <<"D61FA1F5639EE8668D74B527E6806E0503EFC55A42DB7B5F39939D84C07D6895">>}, {<<"parse_trans">>, <<"07CD9577885F56362D414E8C4C4E6BDF10D43A8767ABB92D24CBE8B24C54888B">>}, + {<<"prometheus">>, <<"4905FD2992F8038ECCD7AA0CD22F40637ED618C0BED1F75C05AACEC15B7545DE">>}, {<<"ranch">>, <<"49FBCFD3682FAB1F5D109351B61257676DA1A2FDBE295904176D5E521A2DDFE5">>}, - {<<"ssl_verify_fun">>, <<"BDB0D2471F453C88FF3908E7686F86F9BE327D065CC1EC16FA4540197EA04680">>}, + {<<"ssl_verify_fun">>, <<"FE4C190E8F37401D30167C8C405EDA19469F34577987C76DDE613E838BBC67F8">>}, {<<"unicode_util_compat">>, <<"25EEE6D67DF61960CF6A794239566599B09E17E668D3700247BC498638152521">>}]} ]. diff --git a/src/machinery_machine_unique_tag_mg_example.erl b/src/machinery_machine_unique_tag_mg_example.erl index cfe1653..6b787c0 100644 --- a/src/machinery_machine_unique_tag_mg_example.erl +++ b/src/machinery_machine_unique_tag_mg_example.erl @@ -82,7 +82,7 @@ config() -> schema => machinery_mg_schema_generic, url => <<"http://machinegun:8022/v1/automaton">>, handler_path => <<"/v1/stateproc">>, - event_handler => woody_event_handler_default, + event_handler => {woody_event_handler_default, #{}}, server_opts => #{ ip => {0, 0, 0, 0}, port => 8022 diff --git a/src/machinery_mg_schema.erl b/src/machinery_mg_schema.erl index 2af36fd..18872c9 100644 --- a/src/machinery_mg_schema.erl +++ b/src/machinery_mg_schema.erl @@ -18,8 +18,8 @@ | {repair, success | failure}} - | {event, Version} - | {aux_state, Version}. + | {event, version()} + | {aux_state, version()}. -type v(T) :: T. diff --git a/src/machinery_utils.erl b/src/machinery_utils.erl index cf45b5d..3399580 100644 --- a/src/machinery_utils.erl +++ b/src/machinery_utils.erl @@ -54,7 +54,7 @@ expand_modopts(Mod, Opts) -> woody_child_spec(Id, Routes, Config) -> woody_server:child_spec(Id, Config#{ %% ev handler for `handlers`, which is `[]`, so this is just to satisfy the spec. - event_handler => woody_event_handler_default, + event_handler => {woody_event_handler_default, #{}}, handlers => [], additional_routes => Routes }). diff --git a/test/machinery_call_SUITE.erl b/test/machinery_call_SUITE.erl index dcd83ba..e24f24c 100644 --- a/test/machinery_call_SUITE.erl +++ b/test/machinery_call_SUITE.erl @@ -204,7 +204,7 @@ child_spec(machinery_mg_backend, _C) -> Handler = {?MODULE, BackendConfig}, Routes = machinery_mg_backend:get_routes( [Handler], - #{event_handler => woody_event_handler_default} + #{event_handler => {woody_event_handler_default, #{}}} ), ServerConfig = #{ ip => {0, 0, 0, 0}, @@ -223,7 +223,7 @@ get_backend(machinery_mg_backend, C) -> #{ client => #{ url => <<"http://machinegun:8022/v1/automaton">>, - event_handler => woody_event_handler_default + event_handler => {woody_event_handler_default, #{}} }, schema => machinery_mg_schema_generic } diff --git a/test/machinery_mg_modernizer_flow_SUITE.erl b/test/machinery_mg_modernizer_flow_SUITE.erl index f68e8f9..794fef5 100644 --- a/test/machinery_mg_modernizer_flow_SUITE.erl +++ b/test/machinery_mg_modernizer_flow_SUITE.erl @@ -241,7 +241,7 @@ backend_mg_routes() -> Handler = {?MODULE, BackendConfig}, machinery_mg_backend:get_routes( [Handler], - #{event_handler => woody_event_handler_default} + #{event_handler => {woody_event_handler_default, #{}}} ). modernizer_mg_routes() -> @@ -253,7 +253,7 @@ modernizer_mg_routes() -> }, machinery_modernizer_mg_backend:get_routes( [ModernizerConfig], - #{event_handler => woody_event_handler_default} + #{event_handler => {woody_event_handler_default, #{}}} ). -spec get_backend(config()) -> machinery_mg_backend:backend(). @@ -273,7 +273,7 @@ get_backend(machinery_mg_backend, C) -> #{ client => #{ url => <<"http://machinegun:8022/v1/automaton">>, - event_handler => woody_event_handler_default + event_handler => {woody_event_handler_default, #{}} }, schema => ?MODULE } @@ -284,7 +284,7 @@ get_backend(machinery_modernizer_mg_backend, C) -> #{ client => #{ url => <<"http://machinegun:8022/v1/automaton">>, - event_handler => woody_event_handler_default + event_handler => {woody_event_handler_default, #{}} }, schema => ?MODULE } diff --git a/test/machinery_mg_schema_flow_SUITE.erl b/test/machinery_mg_schema_flow_SUITE.erl index 6c9d496..da44609 100644 --- a/test/machinery_mg_schema_flow_SUITE.erl +++ b/test/machinery_mg_schema_flow_SUITE.erl @@ -226,7 +226,7 @@ child_spec(machinery_mg_backend, _C) -> Handler = {?MODULE, BackendConfig}, Routes = machinery_mg_backend:get_routes( [Handler], - #{event_handler => woody_event_handler_default} + #{event_handler => {woody_event_handler_default, #{}}} ), ServerConfig = #{ ip => {0, 0, 0, 0}, @@ -245,7 +245,7 @@ get_backend(machinery_mg_backend, C) -> #{ client => #{ url => <<"http://machinegun:8022/v1/automaton">>, - event_handler => woody_event_handler_default + event_handler => {woody_event_handler_default, #{}} }, schema => ?MODULE } diff --git a/test/machinery_notify_SUITE.erl b/test/machinery_notify_SUITE.erl index 7ca9d9e..50fcf7b 100644 --- a/test/machinery_notify_SUITE.erl +++ b/test/machinery_notify_SUITE.erl @@ -204,7 +204,7 @@ child_spec(machinery_mg_backend, _C) -> Handler = {?MODULE, BackendConfig}, Routes = machinery_mg_backend:get_routes( [Handler], - #{event_handler => woody_event_handler_default} + #{event_handler => {woody_event_handler_default, #{}}} ), ServerConfig = #{ ip => {0, 0, 0, 0}, @@ -223,7 +223,7 @@ get_backend(machinery_mg_backend, C) -> #{ client => #{ url => <<"http://machinegun:8022/v1/automaton">>, - event_handler => woody_event_handler_default + event_handler => {woody_event_handler_default, #{}} }, schema => machinery_mg_schema_generic } diff --git a/test/machinery_repair_SUITE.erl b/test/machinery_repair_SUITE.erl index 1ee5d50..4688005 100644 --- a/test/machinery_repair_SUITE.erl +++ b/test/machinery_repair_SUITE.erl @@ -235,7 +235,7 @@ child_spec(machinery_mg_backend, _C) -> Handler = {?MODULE, BackendConfig}, Routes = machinery_mg_backend:get_routes( [Handler], - #{event_handler => woody_event_handler_default} + #{event_handler => {woody_event_handler_default, #{}}} ), ServerConfig = #{ ip => {0, 0, 0, 0}, @@ -254,7 +254,7 @@ get_backend(machinery_mg_backend, C) -> #{ client => #{ url => <<"http://machinegun:8022/v1/automaton">>, - event_handler => woody_event_handler_default + event_handler => {woody_event_handler_default, #{}} }, schema => machinery_mg_schema_generic } diff --git a/test/machinery_start_SUITE.erl b/test/machinery_start_SUITE.erl index ecb4db2..ff030b4 100644 --- a/test/machinery_start_SUITE.erl +++ b/test/machinery_start_SUITE.erl @@ -174,7 +174,7 @@ child_spec(machinery_mg_backend, _C) -> Handler = {?MODULE, BackendConfig}, Routes = machinery_mg_backend:get_routes( [Handler], - #{event_handler => woody_event_handler_default} + #{event_handler => {woody_event_handler_default, #{}}} ), ServerConfig = #{ ip => {0, 0, 0, 0}, @@ -193,7 +193,7 @@ get_backend(machinery_mg_backend, C) -> #{ client => #{ url => <<"http://machinegun:8022/v1/automaton">>, - event_handler => woody_event_handler_default + event_handler => {woody_event_handler_default, #{}} }, schema => machinery_mg_schema_generic } diff --git a/test/machinery_timeout_SUITE.erl b/test/machinery_timeout_SUITE.erl index 9cdfc7a..487eaa3 100644 --- a/test/machinery_timeout_SUITE.erl +++ b/test/machinery_timeout_SUITE.erl @@ -241,7 +241,7 @@ child_spec(machinery_mg_backend, _C) -> Handler = {?MODULE, BackendConfig}, Routes = machinery_mg_backend:get_routes( [Handler], - #{event_handler => woody_event_handler_default} + #{event_handler => {woody_event_handler_default, #{}}} ), ServerConfig = #{ ip => {0, 0, 0, 0}, @@ -260,7 +260,7 @@ get_backend(machinery_mg_backend, C) -> #{ client => #{ url => <<"http://machinegun:8022/v1/automaton">>, - event_handler => woody_event_handler_default + event_handler => {woody_event_handler_default, #{}} }, schema => machinery_mg_schema_generic }