yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(telemetry): get release version, not emqx app version

This commit is contained in:
Zaiming Shi 2021-03-15 08:17:01 +01:00 committed by turtleDeng
parent a691a42422
commit 3438a0ebca
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/emqx_telemetry/src/emqx_telemetry.erl
View File

@ -157,7 +157,7 @@ init([Opts]) ->
[#telemetry{uuid = UUID, enabled = Enabled} | _] -> [#telemetry{uuid = UUID, enabled = Enabled} | _] ->
State#state{enabled = Enabled, uuid = UUID} State#state{enabled = Enabled, uuid = UUID}
end, end,
case official_version(emqx_version()) of case official_version(emqx_app:get_release()) of
true -> true ->
{ok, ensure_report_timer(NState), {continue, first_report}}; {ok, ensure_report_timer(NState), {continue, first_report}};
false -> false ->
@ -233,10 +233,6 @@ official_version(Version) ->
ensure_report_timer(State = #state{report_interval = ReportInterval}) -> ensure_report_timer(State = #state{report_interval = ReportInterval}) ->
State#state{timer = emqx_misc:start_timer(ReportInterval, time_to_report_telemetry_data)}. State#state{timer = emqx_misc:start_timer(ReportInterval, time_to_report_telemetry_data)}.
emqx_version() ->
{ok, Version} = application:get_key(emqx, vsn),
Version.
license() -> license() ->
case search_telemetry_license() of case search_telemetry_license() of
{error, not_found} -> {error, not_found} ->
@ -347,7 +343,7 @@ generate_uuid() ->
get_telemetry(#state{uuid = UUID}) -> get_telemetry(#state{uuid = UUID}) ->
OSInfo = os_info(), OSInfo = os_info(),
[{emqx_version, bin(emqx_version())}, [{emqx_version, bin(emqx_app:get_release())},
{license, license()}, {license, license()},
{os_name, bin(get_value(os_name, OSInfo))}, {os_name, bin(get_value(os_name, OSInfo))},
{os_version, bin(get_value(os_version, OSInfo))}, {os_version, bin(get_value(os_version, OSInfo))},