set once the metric engine

benoitc · Apr 2, 2018 · 9604828 · redink · Apr 3, 2018 · benoitc
1 parent 8172a72
commit 9604828
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 9 deletions.
diff --git a/include/hackney.hrl b/include/hackney.hrl
@@ -45,3 +45,6 @@
   path,
   ctype = nil
 }).
+
+
+-define(CONFIG, hackney_config).
diff --git a/src/hackney_app.erl b/src/hackney_app.erl
@@ -20,8 +20,6 @@
 %% ===================================================================
 
 start(_StartType, _StartArgs) ->
-  Metrics = metrics:init(hackney_util:mod_metrics()),
-  application:set_env(hackney, metrics, Metrics),
   hackney_sup:start_link().
 
 stop(_State) ->

diff --git a/src/hackney_connect.erl b/src/hackney_connect.erl
@@ -66,7 +66,7 @@ create_connection(Transport, Host, Port, Options, Dynamic)
   MaxBody = proplists:get_value(max_body, Options),
 
   %% get mod metrics
-  {ok, Engine} = application:get_env(hackney, metrics),
+  Engine = hackney_metrics:get_engine(),
 
   %% initial state
   InitialState = #client{mod_metrics=Engine,
@@ -279,7 +279,7 @@ check_mod_metrics(#client{mod_metrics=Mod}=State)
   when Mod /= nil, Mod /= undefined ->
   State;
 check_mod_metrics(State) ->
-  State#client{mod_metrics=metrics:init(hackney_util:mod_metrics())}.
+  State#client{mod_metrics=hackney_metrics:get_engine()}.
 
 ssl_opts(Host, Options) ->
   case proplists:get_value(ssl_options, Options) of

diff --git a/src/hackney_manager.erl b/src/hackney_manager.erl
@@ -602,8 +602,7 @@ untrack_owner(Pid, Ref, Pids) ->
 
 init_metrics() ->
   %% get metrics module
-  Engine = metrics:init(hackney_util:mod_metrics()),
-
+  Engine = hackney_metrics:get_engine(),
   %% initialise metrics
   _ = metrics:new(Engine, counter, [hackney, nb_requests]),
   _ = metrics:new(Engine, counter, [hackney, total_requests]),

diff --git a/src/hackney_metrics.erl b/src/hackney_metrics.erl
@@ -0,0 +1,27 @@
+%%% -*- erlang -*-
+%%%
+%%% This file is part of hackney released under the Apache 2 license.
+%%% See the NOTICE for more information.
+%%%
+%%% Copyright (c) 2012-2018 Benoît Chesneau <benoitc@e-engura.org>
+%%%
+
+-module(hackney_metrics).
+-author("benoitc").
+
+%% API
+-export([
+  init/0,
+  get_engine/0
+]).
+
+
+-include("hackney.hrl").
+
+
+init() ->
+  Metrics = metrics:init(hackney_util:mod_metrics()),
+  ets:insert(hackney_config, {mod_metrics, Metrics}).
+
+get_engine() ->
+  ets:lookup_element(?CONFIG, mod_metrics, 2).
diff --git a/src/hackney_pool.erl b/src/hackney_pool.erl
@@ -554,7 +554,7 @@ monitor_client(Dest, Ref, State) ->
 
 init_metrics(PoolName) ->
   %% get metrics module
-  Engine = metrics:init(hackney_util:mod_metrics()),
+  Engine = hackney_metrics:get_engine(),
 
   %% initialise metrics
   _ = metrics:new(Engine, histogram, [hackney_pool, PoolName, take_rate]),

diff --git a/src/hackney_sup.erl b/src/hackney_sup.erl
@@ -3,7 +3,7 @@
 %%% This file is part of hackney released under the Apache 2 license.
 %%% See the NOTICE for more information.
 %%%
-%%% Copyright (c) 2012-2014 Benoît Chesneau <benoitc@e-engura.org>
+%%% Copyright (c) 2012-2018 Benoît Chesneau <benoitc@e-engura.org>
 %%%
 
 -module(hackney_sup).
@@ -16,6 +16,8 @@
 %% Supervisor callbacks
 -export([init/1]).
 
+-include("hackney.hrl").
+
 %% Helper macro for declaring children of supervisor
 -define(CHILD(I, Type), {I, {I, start_link, []}, permanent, 5000, Type, [I]}).
 
@@ -28,7 +30,6 @@ start_link() ->
   %% start the pool handler
   PoolHandler = hackney_app:get_app_env(pool_handler, hackney_pool),
   ok = PoolHandler:start(),
-
   %% finish to start the application
   {ok, Pid}.
 
@@ -37,5 +38,10 @@ start_link() ->
 %% ===================================================================
 
 init([]) ->
+  %% initialize the config table
+  _ = ets:new(?CONFIG, [set, named_table, public]),
+  %% initialize the metric engine
+  hackney_metrics:init(),
   Manager = ?CHILD(hackney_manager, worker),
   {ok, { {one_for_one, 10000, 1}, [Manager]}}.
+