fix: create trace schema at runtime
This commit is contained in:
parent
25215244be
commit
1b14b79286
|
@ -240,7 +240,7 @@ t_trace_cmd(_) ->
|
||||||
logger:set_primary_config(level, error).
|
logger:set_primary_config(level, error).
|
||||||
|
|
||||||
t_traces_cmd(_) ->
|
t_traces_cmd(_) ->
|
||||||
emqx_trace:mnesia(boot),
|
emqx_trace:create_table(),
|
||||||
Count1 = emqx_mgmt_cli:traces(["list"]),
|
Count1 = emqx_mgmt_cli:traces(["list"]),
|
||||||
?assertEqual(0, Count1),
|
?assertEqual(0, Count1),
|
||||||
Error1 = emqx_mgmt_cli:traces(["start", "test-name", "client", "clientid-dev"]),
|
Error1 = emqx_mgmt_cli:traces(["start", "test-name", "client", "clientid-dev"]),
|
||||||
|
|
|
@ -22,12 +22,6 @@
|
||||||
|
|
||||||
-logger_header("[Tracer]").
|
-logger_header("[Tracer]").
|
||||||
|
|
||||||
%% Mnesia bootstrap
|
|
||||||
-export([mnesia/1]).
|
|
||||||
|
|
||||||
-boot_mnesia({mnesia, [boot]}).
|
|
||||||
-copy_mnesia({mnesia, [copy]}).
|
|
||||||
|
|
||||||
-export([ publish/1
|
-export([ publish/1
|
||||||
, subscribe/3
|
, subscribe/3
|
||||||
, unsubscribe/2
|
, unsubscribe/2
|
||||||
|
@ -57,7 +51,9 @@
|
||||||
-define(MAX_SIZE, 30).
|
-define(MAX_SIZE, 30).
|
||||||
|
|
||||||
-ifdef(TEST).
|
-ifdef(TEST).
|
||||||
-export([log_file/2]).
|
-export([ log_file/2
|
||||||
|
, create_table/0
|
||||||
|
]).
|
||||||
-endif.
|
-endif.
|
||||||
|
|
||||||
-export_type([ip_address/0]).
|
-export_type([ip_address/0]).
|
||||||
|
@ -72,15 +68,6 @@
|
||||||
, end_at :: integer() | undefined | '_'
|
, end_at :: integer() | undefined | '_'
|
||||||
}).
|
}).
|
||||||
|
|
||||||
mnesia(boot) ->
|
|
||||||
ok = ekka_mnesia:create_table(?TRACE, [
|
|
||||||
{type, set},
|
|
||||||
{disc_copies, [node()]},
|
|
||||||
{record_name, ?TRACE},
|
|
||||||
{attributes, record_info(fields, ?TRACE)}]);
|
|
||||||
mnesia(copy) ->
|
|
||||||
ok = ekka_mnesia:copy_table(?TRACE, disc_copies).
|
|
||||||
|
|
||||||
publish(#message{topic = <<"$SYS/", _/binary>>}) -> ignore;
|
publish(#message{topic = <<"$SYS/", _/binary>>}) -> ignore;
|
||||||
publish(#message{from = From, topic = Topic, payload = Payload}) when
|
publish(#message{from = From, topic = Topic, payload = Payload}) when
|
||||||
is_binary(From); is_atom(From) ->
|
is_binary(From); is_atom(From) ->
|
||||||
|
@ -198,6 +185,7 @@ format(Traces) ->
|
||||||
end, Traces).
|
end, Traces).
|
||||||
|
|
||||||
init([]) ->
|
init([]) ->
|
||||||
|
ok = create_table(),
|
||||||
erlang:process_flag(trap_exit, true),
|
erlang:process_flag(trap_exit, true),
|
||||||
OriginLogLevel = emqx_logger:get_primary_log_level(),
|
OriginLogLevel = emqx_logger:get_primary_log_level(),
|
||||||
ok = filelib:ensure_dir(trace_dir()),
|
ok = filelib:ensure_dir(trace_dir()),
|
||||||
|
@ -208,6 +196,14 @@ init([]) ->
|
||||||
TRef = update_trace(Traces),
|
TRef = update_trace(Traces),
|
||||||
{ok, #{timer => TRef, monitors => #{}, primary_log_level => OriginLogLevel}}.
|
{ok, #{timer => TRef, monitors => #{}, primary_log_level => OriginLogLevel}}.
|
||||||
|
|
||||||
|
create_table() ->
|
||||||
|
ok = ekka_mnesia:create_table(?TRACE, [
|
||||||
|
{type, set},
|
||||||
|
{disc_copies, [node()]},
|
||||||
|
{record_name, ?TRACE},
|
||||||
|
{attributes, record_info(fields, ?TRACE)}]),
|
||||||
|
ok = ekka_mnesia:copy_table(?TRACE, disc_copies).
|
||||||
|
|
||||||
handle_call(Req, _From, State) ->
|
handle_call(Req, _From, State) ->
|
||||||
?LOG(error, "Unexpected call: ~p", [Req]),
|
?LOG(error, "Unexpected call: ~p", [Req]),
|
||||||
{reply, ok, State}.
|
{reply, ok, State}.
|
||||||
|
|
|
@ -33,15 +33,22 @@ all() ->
|
||||||
emqx_ct:all(?MODULE).
|
emqx_ct:all(?MODULE).
|
||||||
|
|
||||||
init_per_suite(Config) ->
|
init_per_suite(Config) ->
|
||||||
application:load(emqx_plugin_libs),
|
|
||||||
emqx_ct_helpers:start_apps([]),
|
emqx_ct_helpers:start_apps([]),
|
||||||
Config.
|
Config.
|
||||||
|
|
||||||
end_per_suite(_Config) ->
|
end_per_suite(_Config) ->
|
||||||
emqx_ct_helpers:stop_apps([]).
|
emqx_ct_helpers:stop_apps([]).
|
||||||
|
|
||||||
t_base_create_delete(_Config) ->
|
init_per_testcase(_, Config) ->
|
||||||
|
load(),
|
||||||
ok = emqx_trace:clear(),
|
ok = emqx_trace:clear(),
|
||||||
|
Config.
|
||||||
|
|
||||||
|
end_per_testcase(_) ->
|
||||||
|
unload(),
|
||||||
|
ok.
|
||||||
|
|
||||||
|
t_base_create_delete(_Config) ->
|
||||||
Now = erlang:system_time(second),
|
Now = erlang:system_time(second),
|
||||||
Start = to_rfc3339(Now),
|
Start = to_rfc3339(Now),
|
||||||
End = to_rfc3339(Now + 30 * 60),
|
End = to_rfc3339(Now + 30 * 60),
|
||||||
|
@ -84,7 +91,6 @@ t_base_create_delete(_Config) ->
|
||||||
ok.
|
ok.
|
||||||
|
|
||||||
t_create_size_max(_Config) ->
|
t_create_size_max(_Config) ->
|
||||||
emqx_trace:clear(),
|
|
||||||
lists:map(fun(Seq) ->
|
lists:map(fun(Seq) ->
|
||||||
Name = list_to_binary("name" ++ integer_to_list(Seq)),
|
Name = list_to_binary("name" ++ integer_to_list(Seq)),
|
||||||
Trace = [{name, Name}, {type, <<"topic">>},
|
Trace = [{name, Name}, {type, <<"topic">>},
|
||||||
|
@ -100,7 +106,6 @@ t_create_size_max(_Config) ->
|
||||||
ok.
|
ok.
|
||||||
|
|
||||||
t_create_failed(_Config) ->
|
t_create_failed(_Config) ->
|
||||||
ok = emqx_trace:clear(),
|
|
||||||
UnknownField = [{<<"unknown">>, 12}],
|
UnknownField = [{<<"unknown">>, 12}],
|
||||||
{error, Reason1} = emqx_trace:create(UnknownField),
|
{error, Reason1} = emqx_trace:create(UnknownField),
|
||||||
?assertEqual(<<"unknown field: {unknown,12}">>, iolist_to_binary(Reason1)),
|
?assertEqual(<<"unknown field: {unknown,12}">>, iolist_to_binary(Reason1)),
|
||||||
|
@ -139,7 +144,6 @@ t_create_failed(_Config) ->
|
||||||
ok.
|
ok.
|
||||||
|
|
||||||
t_create_default(_Config) ->
|
t_create_default(_Config) ->
|
||||||
ok = emqx_trace:clear(),
|
|
||||||
{error, "name required"} = emqx_trace:create([]),
|
{error, "name required"} = emqx_trace:create([]),
|
||||||
ok = emqx_trace:create([{<<"name">>, <<"test-name">>},
|
ok = emqx_trace:create([{<<"name">>, <<"test-name">>},
|
||||||
{<<"type">>, <<"clientid">>}, {<<"clientid">>, <<"good">>}]),
|
{<<"type">>, <<"clientid">>}, {<<"clientid">>, <<"good">>}]),
|
||||||
|
@ -170,7 +174,6 @@ t_create_default(_Config) ->
|
||||||
ok.
|
ok.
|
||||||
|
|
||||||
t_update_enable(_Config) ->
|
t_update_enable(_Config) ->
|
||||||
ok = emqx_trace:clear(),
|
|
||||||
Name = <<"test-name">>,
|
Name = <<"test-name">>,
|
||||||
Now = erlang:system_time(second),
|
Now = erlang:system_time(second),
|
||||||
End = list_to_binary(calendar:system_time_to_rfc3339(Now + 2)),
|
End = list_to_binary(calendar:system_time_to_rfc3339(Now + 2)),
|
||||||
|
@ -192,8 +195,6 @@ t_update_enable(_Config) ->
|
||||||
ok.
|
ok.
|
||||||
|
|
||||||
t_load_state(_Config) ->
|
t_load_state(_Config) ->
|
||||||
emqx_trace:clear(),
|
|
||||||
load(),
|
|
||||||
Now = erlang:system_time(second),
|
Now = erlang:system_time(second),
|
||||||
Running = [{<<"name">>, <<"Running">>}, {<<"type">>, <<"topic">>},
|
Running = [{<<"name">>, <<"Running">>}, {<<"type">>, <<"topic">>},
|
||||||
{<<"topic">>, <<"/x/y/1">>}, {<<"start_at">>, to_rfc3339(Now - 1)},
|
{<<"topic">>, <<"/x/y/1">>}, {<<"start_at">>, to_rfc3339(Now - 1)},
|
||||||
|
@ -218,14 +219,11 @@ t_load_state(_Config) ->
|
||||||
Enables2 = lists:map(fun(#{name := Name, enable := Enable}) -> {Name, Enable} end, Traces2),
|
Enables2 = lists:map(fun(#{name := Name, enable := Enable}) -> {Name, Enable} end, Traces2),
|
||||||
ExpectEnables2 = [{<<"Running">>, false}, {<<"Waiting">>, true}],
|
ExpectEnables2 = [{<<"Running">>, false}, {<<"Waiting">>, true}],
|
||||||
?assertEqual(ExpectEnables2, lists:sort(Enables2)),
|
?assertEqual(ExpectEnables2, lists:sort(Enables2)),
|
||||||
unload(),
|
|
||||||
ok.
|
ok.
|
||||||
|
|
||||||
t_client_event(_Config) ->
|
t_client_event(_Config) ->
|
||||||
application:set_env(emqx, allow_anonymous, true),
|
application:set_env(emqx, allow_anonymous, true),
|
||||||
emqx_trace:clear(),
|
|
||||||
ClientId = <<"client-test">>,
|
ClientId = <<"client-test">>,
|
||||||
load(),
|
|
||||||
Now = erlang:system_time(second),
|
Now = erlang:system_time(second),
|
||||||
Start = to_rfc3339(Now),
|
Start = to_rfc3339(Now),
|
||||||
Name = <<"test_client_id_event">>,
|
Name = <<"test_client_id_event">>,
|
||||||
|
@ -252,12 +250,9 @@ t_client_event(_Config) ->
|
||||||
?assert(erlang:byte_size(Bin) > 0),
|
?assert(erlang:byte_size(Bin) > 0),
|
||||||
?assert(erlang:byte_size(Bin) < erlang:byte_size(Bin2)),
|
?assert(erlang:byte_size(Bin) < erlang:byte_size(Bin2)),
|
||||||
?assert(erlang:byte_size(Bin3) > 0),
|
?assert(erlang:byte_size(Bin3) > 0),
|
||||||
unload(),
|
|
||||||
ok.
|
ok.
|
||||||
|
|
||||||
t_get_log_filename(_Config) ->
|
t_get_log_filename(_Config) ->
|
||||||
ok = emqx_trace:clear(),
|
|
||||||
load(),
|
|
||||||
Now = erlang:system_time(second),
|
Now = erlang:system_time(second),
|
||||||
Start = calendar:system_time_to_rfc3339(Now),
|
Start = calendar:system_time_to_rfc3339(Now),
|
||||||
End = calendar:system_time_to_rfc3339(Now + 2),
|
End = calendar:system_time_to_rfc3339(Now + 2),
|
||||||
|
@ -274,7 +269,6 @@ t_get_log_filename(_Config) ->
|
||||||
?assertEqual(ok, element(1, emqx_trace:get_trace_filename(Name))),
|
?assertEqual(ok, element(1, emqx_trace:get_trace_filename(Name))),
|
||||||
ct:sleep(3000),
|
ct:sleep(3000),
|
||||||
?assertEqual(ok, element(1, emqx_trace:get_trace_filename(Name))),
|
?assertEqual(ok, element(1, emqx_trace:get_trace_filename(Name))),
|
||||||
unload(),
|
|
||||||
ok.
|
ok.
|
||||||
|
|
||||||
t_trace_file(_Config) ->
|
t_trace_file(_Config) ->
|
||||||
|
@ -290,8 +284,6 @@ t_trace_file(_Config) ->
|
||||||
ok.
|
ok.
|
||||||
|
|
||||||
t_download_log(_Config) ->
|
t_download_log(_Config) ->
|
||||||
emqx_trace:clear(),
|
|
||||||
load(),
|
|
||||||
ClientId = <<"client-test">>,
|
ClientId = <<"client-test">>,
|
||||||
Now = erlang:system_time(second),
|
Now = erlang:system_time(second),
|
||||||
Start = to_rfc3339(Now),
|
Start = to_rfc3339(Now),
|
||||||
|
@ -305,7 +297,6 @@ t_download_log(_Config) ->
|
||||||
{ok, ZipFile} = emqx_trace_api:download_zip_log(#{name => Name}, []),
|
{ok, ZipFile} = emqx_trace_api:download_zip_log(#{name => Name}, []),
|
||||||
?assert(filelib:file_size(ZipFile) > 0),
|
?assert(filelib:file_size(ZipFile) > 0),
|
||||||
ok = emqtt:disconnect(Client),
|
ok = emqtt:disconnect(Client),
|
||||||
unload(),
|
|
||||||
ok.
|
ok.
|
||||||
|
|
||||||
to_rfc3339(Second) ->
|
to_rfc3339(Second) ->
|
||||||
|
|
Loading…
Reference in New Issue