Merge pull request #9905 from zmstone/0203-disable-telemetry-for-ee-by-default

feat: disable telemetry for ee by default

.github/workflows/run_relup_tests.yaml

@@ -4,13 +4,13 @@ concurrency:
   group: relup-${{ github.event_name }}-${{ github.ref }}
   cancel-in-progress: true
 
-on:
+# on:
-  push:
+#   push:
-    branches:
+#     branches:
-      - '**'
+#       - '**'
-    tags:
+#     tags:
-      - e*
+#       - e*
-  pull_request:
+#   pull_request:
 
 jobs:
   relup_test_plan:

lib-ee/emqx_ee_conf/etc/emqx-enterprise.conf

@@ -0,0 +1 @@
+telemetry.enable = false

scripts/merge-config.escript

@@ -30,7 +30,7 @@ main(_) ->
     case IsEnterprise of
         true ->
             EnterpriseCfgs = get_all_cfgs("lib-ee"),
-            EnterpriseConf = merge("", EnterpriseCfgs),
+            EnterpriseConf = merge(<<"">>, EnterpriseCfgs),
             ok = file:write_file("apps/emqx_conf/etc/emqx-enterprise.conf.all", EnterpriseConf);
         false ->
             ok
@@ -41,22 +41,21 @@ is_enterprise() ->
     nomatch =/= string:find(Profile, "enterprise").
 
 merge(BaseConf, Cfgs) ->
-    lists:foldl(
+    Confs = [BaseConf | lists:map(fun read_conf/1, Cfgs)],
-        fun(CfgFile, Acc) ->
+    infix(lists:filter(fun(I) -> iolist_size(I) > 0 end, Confs), [io_lib:nl(), io_lib:nl()]).
-            case filelib:is_regular(CfgFile) of
+
-                true ->
+read_conf(CfgFile) ->
-                    {ok, Bin1} = file:read_file(CfgFile),
+    case filelib:is_regular(CfgFile) of
-                    case string:trim(Bin1, both) of
+        true ->
-                        <<>> -> Acc;
+            {ok, Bin1} = file:read_file(CfgFile),
-                        Bin2 -> [Acc, io_lib:nl(), io_lib:nl(), Bin2]
+            string:trim(Bin1, both);
-                    end;
+        false ->
-                false ->
+            <<>>
-                    Acc
+    end.
-            end
+
-        end,
+infix([], _With) -> [];
-        BaseConf,
+infix([One], _With) -> [One];
-        Cfgs
+infix([H | T], With) -> [H, With, infix(T, With)].
-    ).
 
 get_all_cfgs(Root) ->
     Apps0 = filelib:wildcard("*", Root) -- ["emqx_machine", "emqx_conf"],

scripts/relup-build/download-base-packages.sh

@@ -14,8 +14,10 @@ export PROFILE
 
 case $PROFILE in
     "emqx-enterprise")
-        DIR='emqx-ee'
+        #DIR='emqx-ee'
-        EDITION='enterprise'
+        #EDITION='enterprise'
+        echo "No relup for now"
+        exit 0
         ;;
     "emqx")
         echo "No relup for opensource edition"