Merge branch 'timing-funcs'

.gitignore

@@ -0,0 +1,4 @@
+.eunit/
+deps/
+doc/
+ebin/

src/folsom_metrics.erl

@@ -106,20 +106,19 @@ get_histogram_sample(Name) ->
 get_history_values(Name, Count) ->
     folsom_event:get_history_values(Name, Count).
 
+%% @doc Fun/funcall instrumentation.
+%%
+%% If an exception occurs, time is not logged.
 histogram_timed_update(Name, Fun) ->
-    Start = folsom_utils:now_epoch_micro(),
-    Fun(),
-    Stop = folsom_utils:now_epoch_micro(),
-    notify({Name, Stop - Start}).
+    histogram_timed_update(Name, Fun, []).
 
 histogram_timed_update(Name, Fun, Args) ->
     Start = folsom_utils:now_epoch_micro(),
-    erlang:apply(Fun, Args),
+    Result = erlang:apply(Fun, Args),
     Stop = folsom_utils:now_epoch_micro(),
-    notify({Name, Stop - Start}).
+    notify({Name, Stop - Start}),
+    Result.
 
 histogram_timed_update(Name, Mod, Fun, Args) ->
-    Start = folsom_utils:now_epoch_micro(),
-    erlang:apply(Mod, Fun, Args),
-    Stop = folsom_utils:now_epoch_micro(),
-    notify({Name, Stop - Start}).
+    Run = fun()->erlang:apply(Mod, Fun, Args) end,
+    histogram_timed_update(Name, Run, []).

test/folsom_metric_checks.erl

@@ -0,0 +1,39 @@
+%%%
+%%% Copyright 2011, Boundary
+%%%
+%%% Licensed under the Apache License, Version 2.0 (the "License");
+%%% you may not use this file except in compliance with the License.
+%%% You may obtain a copy of the License at
+%%%
+%%%     http://www.apache.org/licenses/LICENSE-2.0
+%%%
+%%% Unless required by applicable law or agreed to in writing, software
+%%% distributed under the License is distributed on an "AS IS" BASIS,
+%%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%%% See the License for the specific language governing permissions and
+%%% limitations under the License.
+%%%
+
+
+%%%-------------------------------------------------------------------
+%%% File:      folsom_metric_checks.erl
+%%% @author    amtal <alex.kropivny@gmail.com>
+%%% @doc External interface tests.
+%%% @end
+%%%------------------------------------------------------------------
+
+-module(folsom_metric_checks).
+
+-include_lib("eunit/include/eunit.hrl").
+
+-export([ histograms/0
+        ]).
+
+-define(FM, folsom_metrics).
+
+histograms() ->
+    ok = ?FM:new_histogram(funcalls,uniform),
+    5 = ?FM:histogram_timed_update(funcalls, fun()->abs(-5) end),
+    5 = ?FM:histogram_timed_update(funcalls, fun(X)->abs(X) end, [-5]),
+    5 = ?FM:histogram_timed_update(funcalls, erlang, abs, [-5]),
+    [_,_,_] = ?FM:get_histogram_sample(funcalls).

test/folsom_tests.erl

@@ -39,6 +39,8 @@ run_test() ->
     ibrowse:stop(),
 
     folsom_erlang_checks:delete_metrics(),
+
+    folsom_metric_checks:histograms(),
 
     folsom:stop().