From 81d4bd10a3910b03513e88ff06d603ce99e385f3 Mon Sep 17 00:00:00 2001 From: zhongwencool Date: Wed, 26 Oct 2022 10:07:44 +0800 Subject: [PATCH] fix: alway use os:system_time/1 when managing traces --- apps/emqx_plugin_libs/src/emqx_trace/emqx_trace.erl | 3 ++- apps/emqx_plugin_libs/src/emqx_trace/emqx_trace_api.erl | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/emqx_plugin_libs/src/emqx_trace/emqx_trace.erl b/apps/emqx_plugin_libs/src/emqx_trace/emqx_trace.erl index 93455523e..6e295ab49 100644 --- a/apps/emqx_plugin_libs/src/emqx_trace/emqx_trace.erl +++ b/apps/emqx_plugin_libs/src/emqx_trace/emqx_trace.erl @@ -36,6 +36,7 @@ , delete/1 , clear/0 , update/2 + , os_now/0 ]). -export([ format/1 @@ -515,6 +516,6 @@ set_log_primary_level(NewLevel) -> false -> ok end. -%% the dashboard use os time to create trace, donot use erlang:system_time/1 +%% the dashboard use os time to create trace, do not use erlang:system_time/1 os_now() -> os:system_time(second). diff --git a/apps/emqx_plugin_libs/src/emqx_trace/emqx_trace_api.erl b/apps/emqx_plugin_libs/src/emqx_trace/emqx_trace_api.erl index a478b8a63..126ff2573 100644 --- a/apps/emqx_plugin_libs/src/emqx_trace/emqx_trace_api.erl +++ b/apps/emqx_plugin_libs/src/emqx_trace/emqx_trace_api.erl @@ -44,7 +44,7 @@ list_trace(_, _Params) -> Nodes = ekka_mnesia:running_nodes(), TraceSize = cluster_call(?MODULE, get_trace_size, [], 30000), AllFileSize = lists:foldl(fun(F, Acc) -> maps:merge(Acc, F) end, #{}, TraceSize), - Now = erlang:system_time(second), + Now = emqx_trace:os_now(), Traces = lists:map(fun(Trace = #{name := Name, start_at := Start, end_at := End, enable := Enable, type := Type, filter := Filter}) ->