aboutsummaryrefslogtreecommitdiffstats
path: root/util/statistics.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2020-11-05 22:31:25 +0100
committerKim Alvefur <zash@zash.se>2020-11-05 22:31:25 +0100
commit238b2bfc1cdb65ae7d051c2f29c1427149317795 (patch)
tree58547de6e7795740633c1b93e67c217eb621fe8f /util/statistics.lua
parentce3e3808f5359f481f3ea063220ba71428b26ad5 (diff)
parent48521ba1538f797f5bef64f5fe5f3a9fb6e68f7f (diff)
downloadprosody-238b2bfc1cdb65ae7d051c2f29c1427149317795.tar.gz
prosody-238b2bfc1cdb65ae7d051c2f29c1427149317795.zip
Merge 0.11->trunk
Diffstat (limited to 'util/statistics.lua')
-rw-r--r--util/statistics.lua41
1 files changed, 26 insertions, 15 deletions
diff --git a/util/statistics.lua b/util/statistics.lua
index 39954652..db608217 100644
--- a/util/statistics.lua
+++ b/util/statistics.lua
@@ -44,25 +44,33 @@ local function new_registry(config)
local registry = {};
local methods;
methods = {
- amount = function (name, initial)
- local v = initial or 0;
- registry[name..":amount"] = function () return "amount", v; end
+ amount = function (name, conf)
+ local v = conf and conf.initial or 0;
+ registry[name..":amount"] = function ()
+ return "amount", v, conf;
+ end
return function (new_v) v = new_v; end
end;
- counter = function (name, initial)
- local v = initial or 0;
- registry[name..":amount"] = function () return "amount", v; end
+ counter = function (name, conf)
+ local v = conf and conf.initial or 0;
+ registry[name..":amount"] = function ()
+ return "amount", v, conf;
+ end
return function (delta)
v = v + delta;
end;
end;
- rate = function (name)
- local since, n = time(), 0;
+ rate = function (name, conf)
+ local since, n, total = time(), 0, 0;
registry[name..":rate"] = function ()
+ total = total + n;
local t = time();
local stats = {
rate = n/(t-since);
count = n;
+ total = total;
+ units = conf and conf.units;
+ type = conf and conf.type;
};
since, n = t, 0;
return "rate", stats.rate, stats;
@@ -71,15 +79,16 @@ local function new_registry(config)
n = n + 1;
end;
end;
- distribution = function (name, unit, type)
- type = type or "distribution";
+ distribution = function (name, conf)
+ local units = conf and conf.units;
+ local type = conf and conf.type or "distribution";
local events, last_event = {}, 0;
local n_actual_events = 0;
local since = time();
registry[name..":"..type] = function ()
local new_time = time();
- local stats = get_distribution_stats(events, n_actual_events, since, new_time, unit);
+ local stats = get_distribution_stats(events, n_actual_events, since, new_time, units);
events, last_event = {}, 0;
n_actual_events = 0;
since = new_time;
@@ -94,17 +103,19 @@ local function new_registry(config)
end
end;
end;
- sizes = function (name)
- return methods.distribution(name, "bytes", "size");
+ sizes = function (name, conf)
+ conf = conf or { units = "bytes", type = "size" }
+ return methods.distribution(name, conf);
end;
- times = function (name)
+ times = function (name, conf)
+ local units = conf and conf.units or "seconds";
local events, last_event = {}, 0;
local n_actual_events = 0;
local since = time();
registry[name..":duration"] = function ()
local new_time = time();
- local stats = get_distribution_stats(events, n_actual_events, since, new_time, "seconds");
+ local stats = get_distribution_stats(events, n_actual_events, since, new_time, units);
events, last_event = {}, 0;
n_actual_events = 0;
since = new_time;