From c1163d1952dc35e038125167cc5b1655f3589c6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9F=90=E6=96=87?= <zhongwencool@gmail.com>
Date: Thu, 13 Apr 2023 20:51:14 +0800
Subject: [PATCH] chore: share emqx_trace.hrl between code and test

---
 .../{src/emqx_trace => include}/emqx_trace.hrl   |  0
 apps/emqx/src/emqx_trace/emqx_trace.erl          | 16 +++++++---------
 apps/emqx/test/emqx_trace_SUITE.erl              |  5 +----
 3 files changed, 8 insertions(+), 13 deletions(-)
 rename apps/emqx/{src/emqx_trace => include}/emqx_trace.hrl (100%)

diff --git a/apps/emqx/src/emqx_trace/emqx_trace.hrl b/apps/emqx/include/emqx_trace.hrl
similarity index 100%
rename from apps/emqx/src/emqx_trace/emqx_trace.hrl
rename to apps/emqx/include/emqx_trace.hrl
diff --git a/apps/emqx/src/emqx_trace/emqx_trace.erl b/apps/emqx/src/emqx_trace/emqx_trace.erl
index 533e2e822..f14dc0c15 100644
--- a/apps/emqx/src/emqx_trace/emqx_trace.erl
+++ b/apps/emqx/src/emqx_trace/emqx_trace.erl
@@ -21,6 +21,7 @@
 -include_lib("emqx/include/logger.hrl").
 -include_lib("kernel/include/file.hrl").
 -include_lib("snabbkaffe/include/trace.hrl").
+-include_lib("emqx/include/emqx_trace.hrl").
 
 -export([
     publish/1,
@@ -54,13 +55,10 @@
 
 -export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2, code_change/3]).
 
--include("emqx_trace.hrl").
-
 -ifdef(TEST).
 -export([
     log_file/2,
-    find_closest_time/2,
-    migrate_trace/0
+    find_closest_time/2
 ]).
 -endif.
 
@@ -151,7 +149,7 @@ list(Enable) ->
     | {error,
         {duplicate_condition, iodata()}
         | {already_existed, iodata()}
-        | {error, {bad_type, any()}}
+        | {bad_type, any()}
         | iodata()}.
 create(Trace) ->
     case mnesia:table_info(?TRACE, size) < ?MAX_SIZE of
@@ -227,15 +225,16 @@ format(Traces) ->
 
 init([]) ->
     erlang:process_flag(trap_exit, true),
+    Fields = record_info(fields, ?TRACE),
     ok = mria:create_table(?TRACE, [
         {type, set},
         {rlog_shard, ?SHARD},
         {storage, disc_copies},
         {record_name, ?TRACE},
-        {attributes, record_info(fields, ?TRACE)}
+        {attributes, Fields}
     ]),
     ok = mria:wait_for_tables([?TRACE]),
-    migrate_trace(),
+    maybe_migrate_trace(Fields),
     {ok, _} = mnesia:subscribe({table, ?TRACE, simple}),
     ok = filelib:ensure_dir(filename:join([trace_dir(), dummy])),
     ok = filelib:ensure_dir(filename:join([zip_dir(), dummy])),
@@ -583,8 +582,7 @@ filter_cli_handler(Names) ->
 now_second() ->
     os:system_time(second).
 
-migrate_trace() ->
-    Fields = record_info(fields, ?TRACE),
+maybe_migrate_trace(Fields) ->
     case mnesia:table_info(emqx_trace, attributes) =:= Fields of
         true ->
             ok;
diff --git a/apps/emqx/test/emqx_trace_SUITE.erl b/apps/emqx/test/emqx_trace_SUITE.erl
index 3594f0651..140ec79ff 100644
--- a/apps/emqx/test/emqx_trace_SUITE.erl
+++ b/apps/emqx/test/emqx_trace_SUITE.erl
@@ -22,12 +22,9 @@
 -include_lib("common_test/include/ct.hrl").
 -include_lib("eunit/include/eunit.hrl").
 -include_lib("emqx/include/emqx.hrl").
+-include_lib("emqx/include/emqx_trace.hrl").
 -include_lib("snabbkaffe/include/snabbkaffe.hrl").
 
--record(emqx_trace, {
-    name, type, filter, enable = true, payload_encode = text, extra = #{}, start_at, end_at
-}).
-
 %%--------------------------------------------------------------------
 %% Setups
 %%--------------------------------------------------------------------