From 1546fdcd9460e90db8586ebcd9428922963eb72b Mon Sep 17 00:00:00 2001 From: "Zaiming (Stone) Shi" Date: Wed, 13 Sep 2023 20:25:46 +0200 Subject: [PATCH 1/3] chore(rebar.config): use https for dependency repo reference --- rebar.config | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/rebar.config b/rebar.config index 13afa2df3..7a27a59a1 100644 --- a/rebar.config +++ b/rebar.config @@ -85,13 +85,13 @@ , {jsone, {git, "https://github.com/emqx/jsone.git", {tag, "1.7.1"}}} , {uuid, {git, "https://github.com/okeuday/uuid.git", {tag, "v2.0.6"}}} %% trace - , {opentelemetry_api, {git_subdir, "http://github.com/emqx/opentelemetry-erlang", {tag, "v1.3.0-emqx"}, "apps/opentelemetry_api"}} - , {opentelemetry, {git_subdir, "http://github.com/emqx/opentelemetry-erlang", {tag, "v1.3.0-emqx"}, "apps/opentelemetry"}} + , {opentelemetry_api, {git_subdir, "https://github.com/emqx/opentelemetry-erlang", {tag, "v1.3.0-emqx"}, "apps/opentelemetry_api"}} + , {opentelemetry, {git_subdir, "https://github.com/emqx/opentelemetry-erlang", {tag, "v1.3.0-emqx"}, "apps/opentelemetry"}} %% log metrics - , {opentelemetry_experimental, {git_subdir, "http://github.com/emqx/opentelemetry-erlang", {tag, "v1.3.0-emqx"}, "apps/opentelemetry_experimental"}} - , {opentelemetry_api_experimental, {git_subdir, "http://github.com/emqx/opentelemetry-erlang", {tag, "v1.3.0-emqx"}, "apps/opentelemetry_api_experimental"}} + , {opentelemetry_experimental, {git_subdir, "https://github.com/emqx/opentelemetry-erlang", {tag, "v1.3.0-emqx"}, "apps/opentelemetry_experimental"}} + , {opentelemetry_api_experimental, {git_subdir, "https://github.com/emqx/opentelemetry-erlang", {tag, "v1.3.0-emqx"}, "apps/opentelemetry_api_experimental"}} %% export - , {opentelemetry_exporter, {git_subdir, "http://github.com/emqx/opentelemetry-erlang", {tag, "v1.3.0-emqx"}, "apps/opentelemetry_exporter"}} + , {opentelemetry_exporter, {git_subdir, "https://github.com/emqx/opentelemetry-erlang", {tag, "v1.3.0-emqx"}, "apps/opentelemetry_exporter"}} ]}. {xref_ignores, From 95f1312df7e65c7677c4f27c41773966143a3dab Mon Sep 17 00:00:00 2001 From: "Zaiming (Stone) Shi" Date: Wed, 13 Sep 2023 20:52:08 +0200 Subject: [PATCH 2/3] chore(emqx_ctl): lower command override log from warning to info prior to this change this warning message is always logged if a node joins cluster. the intention of this warning is to detect potential command name clash (provided by different plugins), so arguably it should be at debug level --- apps/emqx_ctl/src/emqx_ctl.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/emqx_ctl/src/emqx_ctl.erl b/apps/emqx_ctl/src/emqx_ctl.erl index a51f4919c..41a843d28 100644 --- a/apps/emqx_ctl/src/emqx_ctl.erl +++ b/apps/emqx_ctl/src/emqx_ctl.erl @@ -250,7 +250,7 @@ handle_call({register_command, Cmd, MF, Opts}, _From, State = #state{seq = Seq}) ets:insert(?CMD_TAB, {{Seq, Cmd}, MF, Opts}), {reply, ok, next_seq(State)}; [[OriginSeq] | _] -> - ?LOG_WARNING(#{msg => "CMD_overridden", cmd => Cmd, mf => MF}), + ?LOG_INFO(#{msg => "CMD_overridden", cmd => Cmd, mf => MF}), true = ets:insert(?CMD_TAB, {{OriginSeq, Cmd}, MF, Opts}), {reply, ok, State} end; From 2bf583087b7bf2b413de5a21ff72d3106fa45dc3 Mon Sep 17 00:00:00 2001 From: "Zaiming (Stone) Shi" Date: Wed, 13 Sep 2023 20:55:42 +0200 Subject: [PATCH 3/3] docs: add changelog for pr 11605 --- changes/ce/fix-11605.en.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 changes/ce/fix-11605.en.md diff --git a/changes/ce/fix-11605.en.md b/changes/ce/fix-11605.en.md new file mode 100644 index 000000000..f32c44bd7 --- /dev/null +++ b/changes/ce/fix-11605.en.md @@ -0,0 +1 @@ +Lower CMD_overridden log severity from warning to info.