You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by rn...@apache.org on 2014/08/20 15:09:09 UTC
[01/14] couch-stats commit: updated refs/heads/master to bb24add
Repository: couchdb-couch-stats
Updated Branches:
refs/heads/master 368277b34 -> bb24add44
Initial commit
Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/commit/48481c77
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/tree/48481c77
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/diff/48481c77
Branch: refs/heads/master
Commit: 48481c7754daeeaec73f10adda59f41cab6b595d
Parents: 368277b
Author: Benjamin Anderson <b...@banjiewen.net>
Authored: Tue Jan 14 16:22:54 2014 -0800
Committer: Robert Newson <rn...@apache.org>
Committed: Tue Aug 19 14:46:47 2014 +0100
----------------------------------------------------------------------
README.md | 31 ++++++++++++++++++++++++++++---
1 file changed, 28 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/blob/48481c77/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 1f95598..53c9ea4 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,29 @@
-couch\_stats
-============
+# couch_stats
-An API for collecting statistics.
+couch_stats is a simple statistics collection app for Erlang applications. Its
+core API is a thin wrapper around a stat storage library (currently Folsom,) but
+abstracting over that library provides several benefits:
+
+* All references to stat storage are in one place, so it's easy to swap
+ the module out.
+
+* Some common patterns, such as tying a process's lifetime to a counter value,
+ are straightforward to support.
+
+* Configuration can be managed in a single place - for example, it's much easier
+ to ensure that all histogram metrics use a 10-second sliding window if those
+ metrics are instantiated/configured centrally.
+
+## Adding a metric
+
+1. Write a stat description file. See `priv/descriptions.cfg for an example.
+ * The metric name should be of type `[atom()]`.
+ * The type should be one of `counter`, `gauge`, or `histogram`.
+
+ If you don't add your metric to a description file, your metric will be
+ accessible via `couch_stats:sample/1`, but it won't be read by the stats
+ collector and therefore won't be available to HTTP `_stats` requests, etc.
+
+2. Tell couch_stats to use your description file via application configuration.
+
+2. Instrument your code with the helper functions in `couch_stats.erl`.
[05/14] couch-stats commit: updated refs/heads/master to bb24add
Posted by rn...@apache.org.
Log unknown messages instead of crashing
Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/commit/6efb035b
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/tree/6efb035b
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/diff/6efb035b
Branch: refs/heads/master
Commit: 6efb035b7f181e3024b3cd87a1875c78f0bf2274
Parents: ba150cd
Author: Benjamin Anderson <b...@banjiewen.net>
Authored: Wed Feb 12 09:16:09 2014 -0800
Committer: Robert Newson <rn...@apache.org>
Committed: Tue Aug 19 14:48:31 2014 +0100
----------------------------------------------------------------------
src/couch_stats_process_tracker.erl | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/blob/6efb035b/src/couch_stats_process_tracker.erl
----------------------------------------------------------------------
diff --git a/src/couch_stats_process_tracker.erl b/src/couch_stats_process_tracker.erl
index bead7c1..825142b 100644
--- a/src/couch_stats_process_tracker.erl
+++ b/src/couch_stats_process_tracker.erl
@@ -35,21 +35,24 @@ init([]) ->
{ok, #st{tracked = dict:new()}}.
handle_call(Msg, _From, State) ->
- {stop, {unknown_call, Msg}, error, State}.
+ twig:log(notice, "~p received unknown call ~p", [?MODULE, Msg]),
+ {noreply, State}.
handle_cast({track, Pid, Name}, #st{tracked=Tracked}=State) ->
couch_stats:increment_counter(Name),
Ref = erlang:monitor(process, Pid),
{noreply, State#st{tracked=dict:store(Ref, Name, Tracked)}};
handle_cast(Msg, State) ->
- {stop, {unknown_cast, Msg}, State}.
+ twig:log(notice, "~p received unknown cast ~p", [?MODULE, Msg]),
+ {noreply, State}.
handle_info({'DOWN', Ref, _, _, _}, #st{tracked=Tracked}=State) ->
Name = dict:fetch(Ref, Tracked),
couch_stats:decrement_counter(Name),
{noreply, State#st{tracked=dict:erase(Ref, Tracked)}};
handle_info(Msg, State) ->
- {stop, {unknown_info, Msg}, State}.
+ twig:log(notice, "~p received unknown message ~p", [?MODULE, Msg]),
+ {noreply, State}.
terminate(_Reason, _State) ->
ok.
[06/14] couch-stats commit: updated refs/heads/master to bb24add
Posted by rn...@apache.org.
Rename couch_stats_stats_collector to couch_stats_aggregator
Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/commit/d40741a6
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/tree/d40741a6
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/diff/d40741a6
Branch: refs/heads/master
Commit: d40741a6556910c7cff5cf1146561f220883be82
Parents: b4543ab
Author: Benjamin Anderson <b...@banjiewen.net>
Authored: Thu Jan 16 15:16:03 2014 -0800
Committer: Robert Newson <rn...@apache.org>
Committed: Tue Aug 19 14:48:31 2014 +0100
----------------------------------------------------------------------
src/couch_stats.app.src | 2 +-
src/couch_stats.erl | 2 +-
src/couch_stats_aggregator.erl | 117 +++++++++++++++++++++++++++++++
src/couch_stats_stats_collector.erl | 117 -------------------------------
src/couch_stats_sup.erl | 2 +-
5 files changed, 120 insertions(+), 120 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/blob/d40741a6/src/couch_stats.app.src
----------------------------------------------------------------------
diff --git a/src/couch_stats.app.src b/src/couch_stats.app.src
index 4f94d46..665636e 100644
--- a/src/couch_stats.app.src
+++ b/src/couch_stats.app.src
@@ -1,7 +1,7 @@
{application, couch_stats, [
{description, "Simple statistics collection"},
{vsn, git},
- {registered, [couch_stats_stats_collector, couch_stats_process_tracker]},
+ {registered, [couch_stats_aggregator, couch_stats_process_tracker]},
{applications, [kernel, stdlib, folsom]},
{mod, {couch_stats_app, []}},
{env, [
http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/blob/d40741a6/src/couch_stats.erl
----------------------------------------------------------------------
diff --git a/src/couch_stats.erl b/src/couch_stats.erl
index f4d753a..563a67c 100644
--- a/src/couch_stats.erl
+++ b/src/couch_stats.erl
@@ -26,7 +26,7 @@ stop() ->
application:stop(couch_stats).
fetch() ->
- couch_stats_stats_collector:fetch().
+ couch_stats_aggregator:fetch().
-spec sample(any()) -> stat().
sample(Name) ->
http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/blob/d40741a6/src/couch_stats_aggregator.erl
----------------------------------------------------------------------
diff --git a/src/couch_stats_aggregator.erl b/src/couch_stats_aggregator.erl
new file mode 100644
index 0000000..fae59f1
--- /dev/null
+++ b/src/couch_stats_aggregator.erl
@@ -0,0 +1,117 @@
+-module(couch_stats_aggregator).
+
+-behaviour(gen_server).
+
+-export([
+ fetch/0
+]).
+
+-export([
+ start_link/0,
+ init/1,
+ handle_call/3,
+ handle_cast/2,
+ handle_info/2,
+ code_change/3,
+ terminate/2
+]).
+
+-record(st, {
+ descriptions,
+ stats,
+ collect_timer,
+ reload_timer
+}).
+
+fetch() ->
+ {ok, Stats} = gen_server:call(?MODULE, fetch),
+ Stats.
+
+start_link() ->
+ gen_server:start_link({local, ?MODULE}, ?MODULE, [], []).
+
+init([]) ->
+ {ok, Descs} = reload_metrics(),
+ Interval = case application:get_env(couch_stats, collection_interval) of
+ {ok, I} -> I * 1000
+ end,
+ {ok, CT} = timer:send_interval(Interval, self(), collect),
+ {ok, RT} = timer:send_interval(600000, self(), reload),
+ {ok, #st{descriptions=Descs, stats=[], collect_timer=CT, reload_timer=RT}}.
+
+handle_call(fetch, _from, #st{stats = Stats}=State) ->
+ {reply, {ok, Stats}, State};
+handle_call(Msg, _From, State) ->
+ {stop, {unknown_call, Msg}, error, State}.
+
+handle_cast(Msg, State) ->
+ {stop, {unknown_cast, Msg}, State}.
+
+handle_info(collect, #st{descriptions=Descriptions}=State) ->
+ Stats = lists:map(
+ fun({Name, Props}) ->
+ {Name, [{value, couch_stats:sample(Name)}|Props]}
+ end,
+ Descriptions
+ ),
+ {noreply, State#st{stats=Stats}};
+handle_info(reload, State) ->
+ {ok, Descriptions} = reload_metrics(),
+ {noreply, State#st{descriptions=Descriptions}};
+handle_info(Msg, State) ->
+ {stop, {unknown_info, Msg}, State}.
+
+terminate(_Reason, _State) ->
+ ok.
+
+code_change(_OldVsn, State, _Extra) ->
+ {ok, State}.
+
+reload_metrics() ->
+ Existing = couch_stats:list(),
+ Current = load_metrics_for_applications(),
+ ToDelete = lists:foldl(
+ fun({_, {Name, [{type, Type}, _]}}, Acc) ->
+ E = {Name, [{type, Type}]},
+ case sets:is_element(E, Acc) of
+ true ->
+ sets:del_element(E, Acc);
+ false ->
+ couch_stats:new(Type, Name),
+ Acc
+ end
+ end,
+ sets:from_list(Existing),
+ Current
+ ),
+ lists:foreach(
+ fun({Name, _}) -> couch_stats:delete(Name) end,
+ sets:to_list(ToDelete)
+ ),
+ {ok, Current}.
+
+load_metrics_for_applications() ->
+ Apps = [element(1, A) || A <- application:which_applications()],
+ lists:foldl(
+ fun(AppName, Acc) ->
+ case load_metrics_for_application(AppName) of
+ error -> Acc;
+ Descriptions -> [{AppName, Descriptions}|Acc]
+ end
+ end,
+ [],
+ Apps
+ ).
+
+load_metrics_for_application(AppName) ->
+ case code:priv_dir(AppName) of
+ {error, _Error} ->
+ error;
+ Dir ->
+ case file:consult(Dir ++ "/stat_descriptions.cfg") of
+ {ok, Descriptions} ->
+ Descriptions;
+ {error, _Error} ->
+ error
+ end
+ end.
http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/blob/d40741a6/src/couch_stats_stats_collector.erl
----------------------------------------------------------------------
diff --git a/src/couch_stats_stats_collector.erl b/src/couch_stats_stats_collector.erl
deleted file mode 100644
index 3176cf5..0000000
--- a/src/couch_stats_stats_collector.erl
+++ /dev/null
@@ -1,117 +0,0 @@
--module(couch_stats_stats_collector).
-
--behaviour(gen_server).
-
--export([
- fetch/0
-]).
-
--export([
- start_link/0,
- init/1,
- handle_call/3,
- handle_cast/2,
- handle_info/2,
- code_change/3,
- terminate/2
-]).
-
--record(st, {
- descriptions,
- stats,
- collect_timer,
- reload_timer
-}).
-
-fetch() ->
- {ok, Stats} = gen_server:call(?MODULE, fetch),
- Stats.
-
-start_link() ->
- gen_server:start_link({local, ?MODULE}, ?MODULE, [], []).
-
-init([]) ->
- {ok, Descs} = reload_metrics(),
- Interval = case application:get_env(couch_stats, collection_interval) of
- {ok, I} -> I * 1000
- end,
- {ok, CT} = timer:send_interval(Interval, self(), collect),
- {ok, RT} = timer:send_interval(600000, self(), reload),
- {ok, #st{descriptions=Descs, stats=[], collect_timer=CT, reload_timer=RT}}.
-
-handle_call(fetch, _from, #st{stats = Stats}=State) ->
- {reply, {ok, Stats}, State};
-handle_call(Msg, _From, State) ->
- {stop, {unknown_call, Msg}, error, State}.
-
-handle_cast(Msg, State) ->
- {stop, {unknown_cast, Msg}, State}.
-
-handle_info(collect, #st{descriptions=Descriptions}=State) ->
- Stats = lists:map(
- fun({Name, Props}) ->
- {Name, [{value, couch_stats:sample(Name)}|Props]}
- end,
- Descriptions
- ),
- {noreply, State#st{stats=Stats}};
-handle_info(reload, State) ->
- {ok, Descriptions} = reload_metrics(),
- {noreply, State#st{descriptions=Descriptions}};
-handle_info(Msg, State) ->
- {stop, {unknown_info, Msg}, State}.
-
-terminate(_Reason, _State) ->
- ok.
-
-code_change(_OldVsn, State, _Extra) ->
- {ok, State}.
-
-reload_metrics() ->
- Existing = couch_stats:list(),
- Current = load_metrics_for_applications(),
- ToDelete = lists:foldl(
- fun({_, {Name, [{type, Type}, _]}}, Acc) ->
- E = {Name, [{type, Type}]},
- case sets:is_element(E, Acc) of
- true ->
- sets:del_element(E, Acc);
- false ->
- couch_stats:new(Type, Name),
- Acc
- end
- end,
- sets:from_list(Existing),
- Current
- ),
- lists:foreach(
- fun({Name, _}) -> couch_stats:delete(Name) end,
- sets:to_list(ToDelete)
- ),
- {ok, Current}.
-
-load_metrics_for_applications() ->
- Apps = [element(1, A) || A <- application:which_applications()],
- lists:foldl(
- fun(AppName, Acc) ->
- case load_metrics_for_application(AppName) of
- error -> Acc;
- Descriptions -> [{AppName, Descriptions}|Acc]
- end
- end,
- [],
- Apps
- ).
-
-load_metrics_for_application(AppName) ->
- case code:priv_dir(AppName) of
- {error, _Error} ->
- error;
- Dir ->
- case file:consult(Dir ++ "/stat_descriptions.cfg") of
- {ok, Descriptions} ->
- Descriptions;
- {error, _Error} ->
- error
- end
- end.
http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/blob/d40741a6/src/couch_stats_sup.erl
----------------------------------------------------------------------
diff --git a/src/couch_stats_sup.erl b/src/couch_stats_sup.erl
index 0b296d4..4943826 100644
--- a/src/couch_stats_sup.erl
+++ b/src/couch_stats_sup.erl
@@ -16,7 +16,7 @@ start_link() ->
init([]) ->
{ok, {
{one_for_one, 5, 10}, [
- ?CHILD(couch_stats_stats_collector, worker),
+ ?CHILD(couch_stats_aggregator, worker),
?CHILD(couch_stats_process_tracker, worker)
]
}}.
[02/14] couch-stats commit: updated refs/heads/master to bb24add
Posted by rn...@apache.org.
Initial code drop
Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/commit/b4543ab7
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/tree/b4543ab7
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/diff/b4543ab7
Branch: refs/heads/master
Commit: b4543ab773c823db09873944be9d42e98283c999
Parents: 48481c7
Author: Benjamin Anderson <b...@banjiewen.net>
Authored: Tue Jan 14 16:22:54 2014 -0800
Committer: Robert Newson <rn...@apache.org>
Committed: Tue Aug 19 14:48:27 2014 +0100
----------------------------------------------------------------------
.gitignore | 6 +
LICENSE | 201 +++++++++++++++++++++++++++++++
priv/sample_descriptions.cfg | 15 +++
rebar.config | 4 +
src/couch_stats.app.src | 10 ++
src/couch_stats.erl | 97 +++++++++++++++
src/couch_stats_app.erl | 11 ++
src/couch_stats_process_tracker.erl | 58 +++++++++
src/couch_stats_stats_collector.erl | 117 ++++++++++++++++++
src/couch_stats_sup.erl | 23 ++++
10 files changed, 542 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/blob/b4543ab7/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..093e7e0
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+*~
+*.beam
+deps
+ebin
+doc
+.project
http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/blob/b4543ab7/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..11069ed
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,201 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+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.
http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/blob/b4543ab7/priv/sample_descriptions.cfg
----------------------------------------------------------------------
diff --git a/priv/sample_descriptions.cfg b/priv/sample_descriptions.cfg
new file mode 100644
index 0000000..1947ad4
--- /dev/null
+++ b/priv/sample_descriptions.cfg
@@ -0,0 +1,15 @@
+%% -*- mode: erlang -*-
+
+%% Example stat descriptions.
+{[couch_stats, sample_counter], [
+ {type, counter},
+ {desc, <<"counters counted by couch_stats">>}
+]}.
+{[couch_stats, sample_histogram], [
+ {type, histogram},
+ {desc, <<"histograms histogrammed by couch_stats">>}
+]}.
+{[couch_stats, sample_gauge], [
+ {type, gauge},
+ {desc, <<"gauges gauged by couch_stats">>}
+]}.
http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/blob/b4543ab7/rebar.config
----------------------------------------------------------------------
diff --git a/rebar.config b/rebar.config
new file mode 100644
index 0000000..46f1ef1
--- /dev/null
+++ b/rebar.config
@@ -0,0 +1,4 @@
+{deps, [
+ {folsom, ".*", {git, "https://github.com/boundary/folsom.git",
+ {tag, "0.8.0"}}}
+]}.
http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/blob/b4543ab7/src/couch_stats.app.src
----------------------------------------------------------------------
diff --git a/src/couch_stats.app.src b/src/couch_stats.app.src
new file mode 100644
index 0000000..4f94d46
--- /dev/null
+++ b/src/couch_stats.app.src
@@ -0,0 +1,10 @@
+{application, couch_stats, [
+ {description, "Simple statistics collection"},
+ {vsn, git},
+ {registered, [couch_stats_stats_collector, couch_stats_process_tracker]},
+ {applications, [kernel, stdlib, folsom]},
+ {mod, {couch_stats_app, []}},
+ {env, [
+ {collection_interval, 10}
+ ]}
+]}.
http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/blob/b4543ab7/src/couch_stats.erl
----------------------------------------------------------------------
diff --git a/src/couch_stats.erl b/src/couch_stats.erl
new file mode 100644
index 0000000..f4d753a
--- /dev/null
+++ b/src/couch_stats.erl
@@ -0,0 +1,97 @@
+-module(couch_stats).
+
+-export([
+ start/0,
+ stop/0,
+ fetch/0,
+ sample/1,
+ new/2,
+ delete/1,
+ list/0,
+ increment_counter/1,
+ increment_counter/2,
+ decrement_counter/1,
+ decrement_counter/2,
+ update_histogram/2,
+ update_gauge/2
+]).
+
+-type response() :: ok | {error, unknown_metric}.
+-type stat() :: {any(), [{atom(), any()}]}.
+
+start() ->
+ application:start(couch_stats).
+
+stop() ->
+ application:stop(couch_stats).
+
+fetch() ->
+ couch_stats_stats_collector:fetch().
+
+-spec sample(any()) -> stat().
+sample(Name) ->
+ [{Name, Info}] = folsom_metrics:get_metric_info(Name),
+ sample_type(Name, proplists:get_value(type, Info)).
+
+-spec new(atom(), any()) -> ok | {error, metric_exists | unsupported_type}.
+new(counter, Name) ->
+ case folsom_metrics:new_counter(Name) of
+ ok -> ok;
+ {error, Name, metric_exists} -> {error, metric_exists}
+ end;
+new(histogram, Name) ->
+ {ok, Time} = application:get_env(couch_stats, collection_interval),
+ case folsom_metrics:new_histogram(Name, slide_uniform, {Time, 1024}) of
+ ok -> ok;
+ {error, Name, metric_exists} -> {error, metric_exists}
+ end;
+new(gauge, Name) ->
+ case folsom_metrics:new_gauge(Name) of
+ ok -> ok;
+ {error, Name, metric_exists} -> {error, metric_exists}
+ end;
+new(_, _) ->
+ {error, unsupported_type}.
+
+delete(Name) ->
+ folsom_metrics:delete_metric(Name).
+
+list() ->
+ folsom_metrics:get_metrics_info().
+
+-spec increment_counter(any()) -> response().
+increment_counter(Name) ->
+ notify(Name, {inc, 1}).
+
+-spec increment_counter(any(), pos_integer()) -> response().
+increment_counter(Name, Value) ->
+ notify(Name, {inc, Value}).
+
+-spec decrement_counter(any()) -> response().
+decrement_counter(Name) ->
+ notify(Name, {dec, 1}).
+
+-spec decrement_counter(any(), pos_integer()) -> response().
+decrement_counter(Name, Value) ->
+ notify(Name, {dec, Value}).
+
+-spec update_histogram(any(), number()) -> response().
+update_histogram(Name, Value) ->
+ notify(Name, Value).
+
+-spec update_gauge(any(), number()) -> response().
+update_gauge(Name, Value) ->
+ notify(Name, Value).
+
+-spec notify(any(), any()) -> response().
+notify(Name, Op) ->
+ case folsom_metrics:notify(Name, Op) of
+ ok -> ok;
+ _ -> {error, unknown_metric}
+ end.
+
+-spec sample_type(any(), atom()) -> stat().
+sample_type(Name, histogram) ->
+ folsom_metrics:get_histogram_statistics(Name);
+sample_type(Name, _) ->
+ folsom_metrics:get_metric_value(Name).
http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/blob/b4543ab7/src/couch_stats_app.erl
----------------------------------------------------------------------
diff --git a/src/couch_stats_app.erl b/src/couch_stats_app.erl
new file mode 100644
index 0000000..e9f7836
--- /dev/null
+++ b/src/couch_stats_app.erl
@@ -0,0 +1,11 @@
+-module(couch_stats_app).
+
+-behaviour(application).
+
+-export([start/2, stop/1]).
+
+start(_StartType, _StartArgs) ->
+ couch_stats_sup:start_link().
+
+stop(_State) ->
+ ok.
http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/blob/b4543ab7/src/couch_stats_process_tracker.erl
----------------------------------------------------------------------
diff --git a/src/couch_stats_process_tracker.erl b/src/couch_stats_process_tracker.erl
new file mode 100644
index 0000000..bead7c1
--- /dev/null
+++ b/src/couch_stats_process_tracker.erl
@@ -0,0 +1,58 @@
+-module(couch_stats_process_tracker).
+-behaviour(gen_server).
+
+-export([
+ track/1,
+ track/2
+]).
+
+-export([
+ start_link/0,
+ init/1,
+ handle_call/3,
+ handle_cast/2,
+ handle_info/2,
+ code_change/3,
+ terminate/2
+]).
+
+-record(st, {
+ tracked
+}).
+
+-spec track(any()) -> ok.
+track(Name) ->
+ track(self(), Name).
+
+-spec track(pid(), any()) -> ok.
+track(Name, Pid) ->
+ gen_server:cast(?MODULE, {track, Name, Pid}).
+
+start_link() ->
+ gen_server:start_link({local, ?MODULE}, ?MODULE, [], []).
+
+init([]) ->
+ {ok, #st{tracked = dict:new()}}.
+
+handle_call(Msg, _From, State) ->
+ {stop, {unknown_call, Msg}, error, State}.
+
+handle_cast({track, Pid, Name}, #st{tracked=Tracked}=State) ->
+ couch_stats:increment_counter(Name),
+ Ref = erlang:monitor(process, Pid),
+ {noreply, State#st{tracked=dict:store(Ref, Name, Tracked)}};
+handle_cast(Msg, State) ->
+ {stop, {unknown_cast, Msg}, State}.
+
+handle_info({'DOWN', Ref, _, _, _}, #st{tracked=Tracked}=State) ->
+ Name = dict:fetch(Ref, Tracked),
+ couch_stats:decrement_counter(Name),
+ {noreply, State#st{tracked=dict:erase(Ref, Tracked)}};
+handle_info(Msg, State) ->
+ {stop, {unknown_info, Msg}, State}.
+
+terminate(_Reason, _State) ->
+ ok.
+
+code_change(_OldVsn, State, _Extra) ->
+ {ok, State}.
http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/blob/b4543ab7/src/couch_stats_stats_collector.erl
----------------------------------------------------------------------
diff --git a/src/couch_stats_stats_collector.erl b/src/couch_stats_stats_collector.erl
new file mode 100644
index 0000000..3176cf5
--- /dev/null
+++ b/src/couch_stats_stats_collector.erl
@@ -0,0 +1,117 @@
+-module(couch_stats_stats_collector).
+
+-behaviour(gen_server).
+
+-export([
+ fetch/0
+]).
+
+-export([
+ start_link/0,
+ init/1,
+ handle_call/3,
+ handle_cast/2,
+ handle_info/2,
+ code_change/3,
+ terminate/2
+]).
+
+-record(st, {
+ descriptions,
+ stats,
+ collect_timer,
+ reload_timer
+}).
+
+fetch() ->
+ {ok, Stats} = gen_server:call(?MODULE, fetch),
+ Stats.
+
+start_link() ->
+ gen_server:start_link({local, ?MODULE}, ?MODULE, [], []).
+
+init([]) ->
+ {ok, Descs} = reload_metrics(),
+ Interval = case application:get_env(couch_stats, collection_interval) of
+ {ok, I} -> I * 1000
+ end,
+ {ok, CT} = timer:send_interval(Interval, self(), collect),
+ {ok, RT} = timer:send_interval(600000, self(), reload),
+ {ok, #st{descriptions=Descs, stats=[], collect_timer=CT, reload_timer=RT}}.
+
+handle_call(fetch, _from, #st{stats = Stats}=State) ->
+ {reply, {ok, Stats}, State};
+handle_call(Msg, _From, State) ->
+ {stop, {unknown_call, Msg}, error, State}.
+
+handle_cast(Msg, State) ->
+ {stop, {unknown_cast, Msg}, State}.
+
+handle_info(collect, #st{descriptions=Descriptions}=State) ->
+ Stats = lists:map(
+ fun({Name, Props}) ->
+ {Name, [{value, couch_stats:sample(Name)}|Props]}
+ end,
+ Descriptions
+ ),
+ {noreply, State#st{stats=Stats}};
+handle_info(reload, State) ->
+ {ok, Descriptions} = reload_metrics(),
+ {noreply, State#st{descriptions=Descriptions}};
+handle_info(Msg, State) ->
+ {stop, {unknown_info, Msg}, State}.
+
+terminate(_Reason, _State) ->
+ ok.
+
+code_change(_OldVsn, State, _Extra) ->
+ {ok, State}.
+
+reload_metrics() ->
+ Existing = couch_stats:list(),
+ Current = load_metrics_for_applications(),
+ ToDelete = lists:foldl(
+ fun({_, {Name, [{type, Type}, _]}}, Acc) ->
+ E = {Name, [{type, Type}]},
+ case sets:is_element(E, Acc) of
+ true ->
+ sets:del_element(E, Acc);
+ false ->
+ couch_stats:new(Type, Name),
+ Acc
+ end
+ end,
+ sets:from_list(Existing),
+ Current
+ ),
+ lists:foreach(
+ fun({Name, _}) -> couch_stats:delete(Name) end,
+ sets:to_list(ToDelete)
+ ),
+ {ok, Current}.
+
+load_metrics_for_applications() ->
+ Apps = [element(1, A) || A <- application:which_applications()],
+ lists:foldl(
+ fun(AppName, Acc) ->
+ case load_metrics_for_application(AppName) of
+ error -> Acc;
+ Descriptions -> [{AppName, Descriptions}|Acc]
+ end
+ end,
+ [],
+ Apps
+ ).
+
+load_metrics_for_application(AppName) ->
+ case code:priv_dir(AppName) of
+ {error, _Error} ->
+ error;
+ Dir ->
+ case file:consult(Dir ++ "/stat_descriptions.cfg") of
+ {ok, Descriptions} ->
+ Descriptions;
+ {error, _Error} ->
+ error
+ end
+ end.
http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/blob/b4543ab7/src/couch_stats_sup.erl
----------------------------------------------------------------------
diff --git a/src/couch_stats_sup.erl b/src/couch_stats_sup.erl
new file mode 100644
index 0000000..0b296d4
--- /dev/null
+++ b/src/couch_stats_sup.erl
@@ -0,0 +1,23 @@
+-module(couch_stats_sup).
+
+-behaviour(supervisor).
+
+-export([
+ start_link/0,
+ init/1
+]).
+
+-define(CHILD(I, Type), {I, {I, start_link, []}, permanent, 5000, Type, [I]}).
+
+start_link() ->
+ supervisor:start_link({local, ?MODULE}, ?MODULE, []).
+
+
+init([]) ->
+ {ok, {
+ {one_for_one, 5, 10}, [
+ ?CHILD(couch_stats_stats_collector, worker),
+ ?CHILD(couch_stats_process_tracker, worker)
+ ]
+ }}.
+
[08/14] couch-stats commit: updated refs/heads/master to bb24add
Posted by rn...@apache.org.
Handle the proper existing metric error atom
Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/commit/dfc415cd
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/tree/dfc415cd
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/diff/dfc415cd
Branch: refs/heads/master
Commit: dfc415cd5e88b7f39999442e8e4cd435502e47d8
Parents: e51375d
Author: Benjamin Anderson <b...@banjiewen.net>
Authored: Tue Feb 4 16:00:32 2014 -0800
Committer: Robert Newson <rn...@apache.org>
Committed: Tue Aug 19 14:48:31 2014 +0100
----------------------------------------------------------------------
src/couch_stats.erl | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/blob/dfc415cd/src/couch_stats.erl
----------------------------------------------------------------------
diff --git a/src/couch_stats.erl b/src/couch_stats.erl
index 563a67c..4668064 100644
--- a/src/couch_stats.erl
+++ b/src/couch_stats.erl
@@ -37,18 +37,18 @@ sample(Name) ->
new(counter, Name) ->
case folsom_metrics:new_counter(Name) of
ok -> ok;
- {error, Name, metric_exists} -> {error, metric_exists}
+ {error, Name, metric_already_exists} -> {error, metric_exists}
end;
new(histogram, Name) ->
{ok, Time} = application:get_env(couch_stats, collection_interval),
case folsom_metrics:new_histogram(Name, slide_uniform, {Time, 1024}) of
ok -> ok;
- {error, Name, metric_exists} -> {error, metric_exists}
+ {error, Name, metric_already_exists} -> {error, metric_exists}
end;
new(gauge, Name) ->
case folsom_metrics:new_gauge(Name) of
ok -> ok;
- {error, Name, metric_exists} -> {error, metric_exists}
+ {error, Name, metric_already_exists} -> {error, metric_exists}
end;
new(_, _) ->
{error, unsupported_type}.
[11/14] couch-stats commit: updated refs/heads/master to bb24add
Posted by rn...@apache.org.
Store tracked processes in ets rather than dict
Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/commit/7c44fe48
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/tree/7c44fe48
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/diff/7c44fe48
Branch: refs/heads/master
Commit: 7c44fe4816e3e3db711c35d7cfa02a76ea9e2aa6
Parents: 30fd32c
Author: Benjamin Anderson <b...@banjiewen.net>
Authored: Wed Feb 12 09:52:50 2014 -0800
Committer: Robert Newson <rn...@apache.org>
Committed: Tue Aug 19 14:48:31 2014 +0100
----------------------------------------------------------------------
src/couch_stats_process_tracker.erl | 26 ++++++++++++++++++--------
1 file changed, 18 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/blob/7c44fe48/src/couch_stats_process_tracker.erl
----------------------------------------------------------------------
diff --git a/src/couch_stats_process_tracker.erl b/src/couch_stats_process_tracker.erl
index 825142b..3d25d03 100644
--- a/src/couch_stats_process_tracker.erl
+++ b/src/couch_stats_process_tracker.erl
@@ -17,7 +17,7 @@
]).
-record(st, {
- tracked
+
}).
-spec track(any()) -> ok.
@@ -32,24 +32,34 @@ start_link() ->
gen_server:start_link({local, ?MODULE}, ?MODULE, [], []).
init([]) ->
- {ok, #st{tracked = dict:new()}}.
+ ets:new(?MODULE, [named_table]),
+ {ok, #st{}}.
handle_call(Msg, _From, State) ->
twig:log(notice, "~p received unknown call ~p", [?MODULE, Msg]),
{noreply, State}.
-handle_cast({track, Pid, Name}, #st{tracked=Tracked}=State) ->
+handle_cast({track, Pid, Name}, State) ->
couch_stats:increment_counter(Name),
Ref = erlang:monitor(process, Pid),
- {noreply, State#st{tracked=dict:store(Ref, Name, Tracked)}};
+ ets:insert(?MODULE, {Ref, Name}),
+ {noreply, State};
handle_cast(Msg, State) ->
twig:log(notice, "~p received unknown cast ~p", [?MODULE, Msg]),
{noreply, State}.
-handle_info({'DOWN', Ref, _, _, _}, #st{tracked=Tracked}=State) ->
- Name = dict:fetch(Ref, Tracked),
- couch_stats:decrement_counter(Name),
- {noreply, State#st{tracked=dict:erase(Ref, Tracked)}};
+handle_info({'DOWN', Ref, _, _, _}=Msg, State) ->
+ case ets:lookup(?MODULE, Ref) of
+ [] ->
+ twig:log(
+ notice,
+ "~p received unknown exit; message was ~p", [?MODULE, Msg]
+ );
+ [{Ref, Name}] ->
+ couch_stats:decrement_counter(Name),
+ ets:delete(?MODULE, Ref)
+ end,
+ {noreply, State};
handle_info(Msg, State) ->
twig:log(notice, "~p received unknown message ~p", [?MODULE, Msg]),
{noreply, State}.
[07/14] couch-stats commit: updated refs/heads/master to bb24add
Posted by rn...@apache.org.
Bump folsom dependency
Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/commit/e51375db
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/tree/e51375db
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/diff/e51375db
Branch: refs/heads/master
Commit: e51375dbc7a5368e82c4dc35dae9031afebc8217
Parents: d40741a
Author: Benjamin Anderson <b...@banjiewen.net>
Authored: Mon Feb 3 14:41:34 2014 -0800
Committer: Robert Newson <rn...@apache.org>
Committed: Tue Aug 19 14:48:31 2014 +0100
----------------------------------------------------------------------
rebar.config | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/blob/e51375db/rebar.config
----------------------------------------------------------------------
diff --git a/rebar.config b/rebar.config
index 46f1ef1..d5e617d 100644
--- a/rebar.config
+++ b/rebar.config
@@ -1,4 +1,4 @@
{deps, [
{folsom, ".*", {git, "https://github.com/boundary/folsom.git",
- {tag, "0.8.0"}}}
+ {tag, "0.8.1"}}}
]}.
[09/14] couch-stats commit: updated refs/heads/master to bb24add
Posted by rn...@apache.org.
Simplify stat reloading functionality
Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/commit/870e2849
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/tree/870e2849
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/diff/870e2849
Branch: refs/heads/master
Commit: 870e28498cf4699ba3633c4a5998c10e8cb3c930
Parents: dfc415c
Author: Benjamin Anderson <b...@banjiewen.net>
Authored: Tue Feb 4 16:02:25 2014 -0800
Committer: Robert Newson <rn...@apache.org>
Committed: Tue Aug 19 14:48:31 2014 +0100
----------------------------------------------------------------------
src/couch_stats_aggregator.erl | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/blob/870e2849/src/couch_stats_aggregator.erl
----------------------------------------------------------------------
diff --git a/src/couch_stats_aggregator.erl b/src/couch_stats_aggregator.erl
index fae59f1..9615bf7 100644
--- a/src/couch_stats_aggregator.erl
+++ b/src/couch_stats_aggregator.erl
@@ -71,11 +71,11 @@ reload_metrics() ->
Existing = couch_stats:list(),
Current = load_metrics_for_applications(),
ToDelete = lists:foldl(
- fun({_, {Name, [{type, Type}, _]}}, Acc) ->
- E = {Name, [{type, Type}]},
- case sets:is_element(E, Acc) of
+ fun({Name, Props}=Stat, Acc) ->
+ Type = proplists:get_value(type, Props),
+ case sets:is_element(Stat, Acc) of
true ->
- sets:del_element(E, Acc);
+ sets:del_element(Stat, Acc);
false ->
couch_stats:new(Type, Name),
Acc
[10/14] couch-stats commit: updated refs/heads/master to bb24add
Posted by rn...@apache.org.
Make couch_stats_process_collector ets table public
Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/commit/7dcc07bb
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/tree/7dcc07bb
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/diff/7dcc07bb
Branch: refs/heads/master
Commit: 7dcc07bb16ca667e7758ec001dd300625ec06832
Parents: 7c44fe4
Author: Benjamin Anderson <b...@banjiewen.net>
Authored: Wed Feb 12 10:05:34 2014 -0800
Committer: Robert Newson <rn...@apache.org>
Committed: Tue Aug 19 14:48:31 2014 +0100
----------------------------------------------------------------------
src/couch_stats_process_tracker.erl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/blob/7dcc07bb/src/couch_stats_process_tracker.erl
----------------------------------------------------------------------
diff --git a/src/couch_stats_process_tracker.erl b/src/couch_stats_process_tracker.erl
index 3d25d03..652d910 100644
--- a/src/couch_stats_process_tracker.erl
+++ b/src/couch_stats_process_tracker.erl
@@ -32,7 +32,7 @@ start_link() ->
gen_server:start_link({local, ?MODULE}, ?MODULE, [], []).
init([]) ->
- ets:new(?MODULE, [named_table]),
+ ets:new(?MODULE, [named_table, public, set]),
{ok, #st{}}.
handle_call(Msg, _From, State) ->
[12/14] couch-stats commit: updated refs/heads/master to bb24add
Posted by rn...@apache.org.
Don't hoist application names in to stat reload logic
Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/commit/500e1207
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/tree/500e1207
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/diff/500e1207
Branch: refs/heads/master
Commit: 500e12079e96a87b5001a93e3243e0b8a3ac1867
Parents: 870e284
Author: Benjamin Anderson <b...@banjiewen.net>
Authored: Tue Feb 4 16:02:45 2014 -0800
Committer: Robert Newson <rn...@apache.org>
Committed: Tue Aug 19 14:48:31 2014 +0100
----------------------------------------------------------------------
src/couch_stats_aggregator.erl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/blob/500e1207/src/couch_stats_aggregator.erl
----------------------------------------------------------------------
diff --git a/src/couch_stats_aggregator.erl b/src/couch_stats_aggregator.erl
index 9615bf7..fe466ba 100644
--- a/src/couch_stats_aggregator.erl
+++ b/src/couch_stats_aggregator.erl
@@ -96,7 +96,7 @@ load_metrics_for_applications() ->
fun(AppName, Acc) ->
case load_metrics_for_application(AppName) of
error -> Acc;
- Descriptions -> [{AppName, Descriptions}|Acc]
+ Descriptions -> Descriptions ++ Acc
end
end,
[],
[13/14] couch-stats commit: updated refs/heads/master to bb24add
Posted by rn...@apache.org.
Simplify couch_stats_aggregator:reload_metrics/0
h/t davisp
Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/commit/30fd32cb
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/tree/30fd32cb
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/diff/30fd32cb
Branch: refs/heads/master
Commit: 30fd32cb12ab7707ce97efd66215921bb1bb4ea3
Parents: 6efb035
Author: Benjamin Anderson <b...@banjiewen.net>
Authored: Wed Feb 12 09:32:22 2014 -0800
Committer: Robert Newson <rn...@apache.org>
Committed: Tue Aug 19 14:48:31 2014 +0100
----------------------------------------------------------------------
src/couch_stats_aggregator.erl | 31 +++++++++++++++----------------
1 file changed, 15 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/blob/30fd32cb/src/couch_stats_aggregator.erl
----------------------------------------------------------------------
diff --git a/src/couch_stats_aggregator.erl b/src/couch_stats_aggregator.erl
index 09ca572..4c7168d 100644
--- a/src/couch_stats_aggregator.erl
+++ b/src/couch_stats_aggregator.erl
@@ -68,25 +68,24 @@ code_change(_OldVsn, State, _Extra) ->
{ok, State}.
reload_metrics() ->
- Existing = couch_stats:list(),
Current = load_metrics_for_applications(),
- ToDelete = lists:foldl(
- fun({Name, Props}=Stat, Acc) ->
+ CurrentSet = sets:from_list(Current),
+ ExistingSet = sets:from_list(couch_stats:list()),
+ ToDelete = sets:subtract(ExistingSet, CurrentSet),
+ ToCreate = sets:subtract(CurrentSet, ExistingSet),
+ sets:fold(
+ fun({Name, _}, _) -> couch_stats:delete(Name), nil end,
+ nil,
+ ToDelete
+ ),
+ sets:fold(
+ fun({Name, Props}, _) ->
Type = proplists:get_value(type, Props),
- case sets:is_element(Stat, Acc) of
- true ->
- sets:del_element(Stat, Acc);
- false ->
- couch_stats:new(Type, Name),
- Acc
- end
+ couch_stats:new(Type, Name),
+ nil
end,
- sets:from_list(Existing),
- Current
- ),
- lists:foreach(
- fun({Name, _}) -> couch_stats:delete(Name) end,
- sets:to_list(ToDelete)
+ nil,
+ ToCreate
),
{ok, Current}.
[14/14] couch-stats commit: updated refs/heads/master to bb24add
Posted by rn...@apache.org.
Use the Apache Mirror of Folsom
Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/commit/bb24add4
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/tree/bb24add4
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/diff/bb24add4
Branch: refs/heads/master
Commit: bb24add4404db20a7b2f8121594b6f54eb18bd0c
Parents: 18749bd
Author: Paul J. Davis <pa...@gmail.com>
Authored: Sun Aug 17 13:03:24 2014 -0500
Committer: Paul J. Davis <pa...@gmail.com>
Committed: Tue Aug 19 12:54:12 2014 -0500
----------------------------------------------------------------------
rebar.config | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/blob/bb24add4/rebar.config
----------------------------------------------------------------------
diff --git a/rebar.config b/rebar.config
index d5e617d..8bdd995 100644
--- a/rebar.config
+++ b/rebar.config
@@ -1,4 +1,4 @@
{deps, [
- {folsom, ".*", {git, "https://github.com/boundary/folsom.git",
- {tag, "0.8.1"}}}
+ {folsom, ".*", {git, "https://git-wip-us.apache.org/repos/asf/couchdb-folsom.git",
+ {branch, master}}}
]}.
[04/14] couch-stats commit: updated refs/heads/master to bb24add
Posted by rn...@apache.org.
Use loaded_applications/0 instead of which_applications/0
This prevents app boot order from determining which metrics are
loaded and which aren't. We'd get them in the end anyway, but the
reload interval is intentionally slow.
Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/commit/ba150cd0
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/tree/ba150cd0
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/diff/ba150cd0
Branch: refs/heads/master
Commit: ba150cd0ca3dae0e5a2e249356d21ee8d80b7b6a
Parents: 500e120
Author: Benjamin Anderson <b...@banjiewen.net>
Authored: Tue Feb 4 16:03:14 2014 -0800
Committer: Robert Newson <rn...@apache.org>
Committed: Tue Aug 19 14:48:31 2014 +0100
----------------------------------------------------------------------
src/couch_stats_aggregator.erl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/blob/ba150cd0/src/couch_stats_aggregator.erl
----------------------------------------------------------------------
diff --git a/src/couch_stats_aggregator.erl b/src/couch_stats_aggregator.erl
index fe466ba..09ca572 100644
--- a/src/couch_stats_aggregator.erl
+++ b/src/couch_stats_aggregator.erl
@@ -91,7 +91,7 @@ reload_metrics() ->
{ok, Current}.
load_metrics_for_applications() ->
- Apps = [element(1, A) || A <- application:which_applications()],
+ Apps = [element(1, A) || A <- application:loaded_applications()],
lists:foldl(
fun(AppName, Acc) ->
case load_metrics_for_application(AppName) of
[03/14] couch-stats commit: updated refs/heads/master to bb24add
Posted by rn...@apache.org.
Add license headers to source files
Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/commit/18749bd7
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/tree/18749bd7
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/diff/18749bd7
Branch: refs/heads/master
Commit: 18749bd7b33d17f70aa8d50839c104036e9e32b3
Parents: 7dcc07b
Author: Paul J. Davis <pa...@gmail.com>
Authored: Fri Feb 14 11:30:50 2014 -0600
Committer: Robert Newson <rn...@apache.org>
Committed: Tue Aug 19 14:48:31 2014 +0100
----------------------------------------------------------------------
src/couch_stats.app.src | 12 ++++++++++++
src/couch_stats.erl | 12 ++++++++++++
src/couch_stats_aggregator.erl | 12 ++++++++++++
src/couch_stats_app.erl | 12 ++++++++++++
src/couch_stats_process_tracker.erl | 12 ++++++++++++
src/couch_stats_sup.erl | 12 ++++++++++++
6 files changed, 72 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/blob/18749bd7/src/couch_stats.app.src
----------------------------------------------------------------------
diff --git a/src/couch_stats.app.src b/src/couch_stats.app.src
index 665636e..d710404 100644
--- a/src/couch_stats.app.src
+++ b/src/couch_stats.app.src
@@ -1,3 +1,15 @@
+% 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.
+
{application, couch_stats, [
{description, "Simple statistics collection"},
{vsn, git},
http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/blob/18749bd7/src/couch_stats.erl
----------------------------------------------------------------------
diff --git a/src/couch_stats.erl b/src/couch_stats.erl
index 4668064..e195e82 100644
--- a/src/couch_stats.erl
+++ b/src/couch_stats.erl
@@ -1,3 +1,15 @@
+% 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.
+
-module(couch_stats).
-export([
http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/blob/18749bd7/src/couch_stats_aggregator.erl
----------------------------------------------------------------------
diff --git a/src/couch_stats_aggregator.erl b/src/couch_stats_aggregator.erl
index 4c7168d..f74403f 100644
--- a/src/couch_stats_aggregator.erl
+++ b/src/couch_stats_aggregator.erl
@@ -1,3 +1,15 @@
+% 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.
+
-module(couch_stats_aggregator).
-behaviour(gen_server).
http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/blob/18749bd7/src/couch_stats_app.erl
----------------------------------------------------------------------
diff --git a/src/couch_stats_app.erl b/src/couch_stats_app.erl
index e9f7836..78880e3 100644
--- a/src/couch_stats_app.erl
+++ b/src/couch_stats_app.erl
@@ -1,3 +1,15 @@
+% 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.
+
-module(couch_stats_app).
-behaviour(application).
http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/blob/18749bd7/src/couch_stats_process_tracker.erl
----------------------------------------------------------------------
diff --git a/src/couch_stats_process_tracker.erl b/src/couch_stats_process_tracker.erl
index 652d910..5b5b97c 100644
--- a/src/couch_stats_process_tracker.erl
+++ b/src/couch_stats_process_tracker.erl
@@ -1,3 +1,15 @@
+% 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.
+
-module(couch_stats_process_tracker).
-behaviour(gen_server).
http://git-wip-us.apache.org/repos/asf/couchdb-couch-stats/blob/18749bd7/src/couch_stats_sup.erl
----------------------------------------------------------------------
diff --git a/src/couch_stats_sup.erl b/src/couch_stats_sup.erl
index 4943826..55755bb 100644
--- a/src/couch_stats_sup.erl
+++ b/src/couch_stats_sup.erl
@@ -1,3 +1,15 @@
+% 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.
+
-module(couch_stats_sup).
-behaviour(supervisor).