De-setup exometer_core

rebar.config

@@ -2,8 +2,7 @@
 {deps,
  [
   {parse_trans, {git, "https://github.com/OpenRiak/parse_trans.git", {branch, "openriak-3.2"}}},
-  {hut, {git, "https://github.com/OpenRiak/hut.git", {branch, "openriak-3.2"}}},
-  {setup, {git, "https://github.com/OpenRiak/setup.git", {branch, "openriak-3.2"}}}
+  {hut, {git, "https://github.com/OpenRiak/hut.git", {branch, "openriak-3.2"}}}
  ]}.
 
 {project_plugins, [rebar3_ex_doc]}.

src/exometer_admin.erl

@@ -87,28 +87,28 @@ load_defaults() ->
     E = exometer_util:get_env(defaults, []),
     do_load_defaults(env, get_predef(E)),
     [do_load_defaults(Src, get_predef(D))
-     || {Src,D} <- setup:find_env_vars(exometer_defaults)],
+     || {Src,D} <- exometer_util:find_env_vars(exometer_defaults)],
     ok.
 
 load_predefined() ->
     E = exometer_util:get_env(predefined, []),
     do_load_predef(env, get_predef(E)),
     [do_load_predef(Src, get_predef(P))
-     || {Src, P} <- setup:find_env_vars(exometer_predefined)],
+     || {Src, P} <- exometer_util:find_env_vars(exometer_predefined)],
     ok.
 
 register_application(App) ->
     %% Ignore if exometer is not running
     case whereis(exometer_admin) of
         undefined -> ok;
         _ ->
-            case setup:get_env(App, exometer_defaults) of
+            case application:get_env(App, exometer_defaults) of
                 {ok, E} ->
                     do_load_defaults(App, get_predef(E));
                 undefined ->
                     ok
             end,
-            case setup:get_env(App, exometer_predefined) of
+            case application:get_env(App, exometer_predefined) of
                 {ok, P} ->
                     do_load_predef(App, get_predef(P));
                 undefined ->
@@ -127,7 +127,7 @@ do_load_defaults(Src, L) when is_list(L) ->
               try set_default(NamePattern, Type, Spec)
               catch
                   error:E ->
-                      ?log(error, "Defaults(~p): ERROR: ~p~n", [Src, E])
+                    ?log(error, "Defaults(~p): ERROR: ~p~n", [Src, E])
               end
       end, L).
 

src/exometer_core.app.src

@@ -2,7 +2,7 @@
              [{description,"Code instrumentation and metrics collection package."},
               {vsn,git},
               {registered,[]},
-              {applications,[kernel,stdlib,hut,setup,parse_trans]},
+              {applications,[kernel,stdlib,hut,parse_trans]},
               {included_applications,[]},
               {mod,{exometer_core_app,[]}},
               {start_phases,[{start_reporters,[]},{preset_defaults,[]}]},

src/exometer_report.erl

@@ -813,12 +813,12 @@ split_env(Tag, Opts) ->
 
 get_reporters(L0) ->
     Rs = exometer_util:get_env(reporters, []),
-    Ext = setup:find_env_vars(exometer_reporters),
+    Ext = exometer_util:find_env_vars(exometer_reporters),
     merge_env(reporters, Rs ++ L0, Ext).
 
 get_subscribers(L0) ->
     Ss = exometer_util:get_env(subscribers, []),
-    Ext = setup:find_env_vars(exometer_subscribers),
+    Ext = exometer_util:find_env_vars(exometer_subscribers),
     merge_env(subscribers, Ss ++ L0, Ext).
 
 merge_env(_, [], []) -> [];

src/exometer_util.erl

@@ -17,6 +17,7 @@
     timestamp_to_datetime/1,
     get_opt/2,
     get_opt/3,
+    find_env_vars/1,
     get_env/2,
     tables/0,
     table/0,
@@ -80,6 +81,20 @@ timestamp_to_datetime(TS) when TS >= 0 ->
     %% return {Datetime, Milliseconds}
     {calendar:now_to_datetime({1258,S,0}), MS}.
 
+find_env_vars(Env) ->
+    lists:flatmap(
+        fun({A,_,_}) ->
+            case application:get_env(A, Env) of
+                {ok, Val} when Val =/= undefined ->
+                    [{A, Val}];
+                _ ->
+                    []
+            end
+        end,
+        application:loaded_applications()
+    ).
+
+
 get_env(Key, Default) ->
     case get_env1(exometer, Key) of
         {ok, Value} ->