X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=metrics.h;h=e2e1e74f5ac9bb818f5bbdb8e6798ec27cadf869;hb=e284d1c7a2e18ee7e4aea082c4a57a3504a0f5e8;hp=2a19e259cc32bf4df11c1eb779d6339b16382fd9;hpb=4194f21b1a5e4ccfe79d40024075ab9795814029;p=nageru

diff --git a/metrics.h b/metrics.h
index 2a19e25..e2e1e74 100644
--- a/metrics.h
+++ b/metrics.h
@@ -7,16 +7,35 @@
 // which makes it quite unwieldy. Thus, we'll package our own for the time being.
 
 #include <atomic>
+#include <chrono>
+#include <deque>
+#include <map>
+#include <memory>
 #include <mutex>
 #include <string>
-#include <map>
+#include <utility>
 #include <vector>
 
+class Histogram;
+class Summary;
+
+// Prometheus recommends the use of timestamps instead of “time since event”,
+// so you can use this to get the number of seconds since the epoch.
+// Note that this will be wrong if your clock changes, so for non-metric use,
+// you should use std::chrono::steady_clock instead.
+double get_timestamp_for_metrics();
+
 class Metrics {
 public:
 	enum Type {
 		TYPE_COUNTER,
 		TYPE_GAUGE,
+		TYPE_HISTOGRAM,  // Internal use only.
+		TYPE_SUMMARY,  // Internal use only.
+	};
+	enum Laziness {
+		PRINT_ALWAYS,
+		PRINT_WHEN_NONEMPTY,
 	};
 
 	void add(const std::string &name, std::atomic<int64_t> *location, Type type = TYPE_COUNTER)
@@ -29,42 +48,115 @@ public:
 		add(name, {}, location, type);
 	}
 
+	void add(const std::string &name, Histogram *location)
+	{
+		add(name, {}, location);
+	}
+
+	void add(const std::string &name, Summary *location)
+	{
+		add(name, {}, location);
+	}
+
 	void add(const std::string &name, const std::vector<std::pair<std::string, std::string>> &labels, std::atomic<int64_t> *location, Type type = TYPE_COUNTER);
 	void add(const std::string &name, const std::vector<std::pair<std::string, std::string>> &labels, std::atomic<double> *location, Type type = TYPE_COUNTER);
+	void add(const std::string &name, const std::vector<std::pair<std::string, std::string>> &labels, Histogram *location, Laziness laziness = PRINT_ALWAYS);
+	void add(const std::string &name, const std::vector<std::pair<std::string, std::string>> &labels, Summary *location, Laziness laziness = PRINT_ALWAYS);
 
-	// Only integer histogram, ie. keys are 0..(N-1).
-	void add_histogram(const std::string &name, const std::vector<std::pair<std::string, std::string>> &labels, std::atomic<int64_t> *location, size_t num_elements);
+	void remove(const std::string &name)
+	{
+		remove(name, {});
+	}
+
+	void remove(const std::string &name, const std::vector<std::pair<std::string, std::string>> &labels);
 
 	std::string serialize() const;
 
 private:
+	static std::string serialize_name(const std::string &name, const std::vector<std::pair<std::string, std::string>> &labels);
+	static std::string serialize_labels(const std::vector<std::pair<std::string, std::string>> &labels);
+
 	enum DataType {
 		DATA_TYPE_INT64,
 		DATA_TYPE_DOUBLE,
+		DATA_TYPE_HISTOGRAM,
+		DATA_TYPE_SUMMARY,
 	};
+	struct MetricKey {
+		MetricKey(const std::string &name, const std::vector<std::pair<std::string, std::string>> labels)
+			: name(name), labels(labels), serialized_labels(serialize_labels(labels))
+		{
+		}
 
+		bool operator< (const MetricKey &other) const
+		{
+			if (name != other.name)
+				return name < other.name;
+			return serialized_labels < other.serialized_labels;
+		}
+
+		const std::string name;
+		const std::vector<std::pair<std::string, std::string>> labels;
+		const std::string serialized_labels;
+	};
 	struct Metric {
 		DataType data_type;
-		std::string name;
-		std::vector<std::pair<std::string, std::string>> labels;
+		Laziness laziness;  // Only for TYPE_HISTOGRAM.
 		union {
 			std::atomic<int64_t> *location_int64;
 			std::atomic<double> *location_double;
+			Histogram *location_histogram;
+			Summary *location_summary;
 		};
 	};
 
-	// TODO: This needs to be more general.
-	struct Histogram {
-		std::string name;
-		std::vector<std::pair<std::string, std::string>> labels;
-		std::atomic<int64_t> *location_int64;  // First bucket.
-		size_t num_elements;
+	mutable std::mutex mu;
+	std::map<std::string, Type> types;  // Ordered the same as metrics.
+	std::map<MetricKey, Metric> metrics;
+
+	friend class Histogram;
+	friend class Summary;
+};
+
+class Histogram {
+public:
+	void init(const std::vector<double> &bucket_vals);
+	void init_uniform(size_t num_buckets);  // Sets up buckets 0..(N-1).
+	void init_geometric(double min, double max, size_t num_buckets);
+	void count_event(double val);
+	std::string serialize(Metrics::Laziness laziness, const std::string &name, const std::vector<std::pair<std::string, std::string>> &labels) const;
+
+private:
+	// Bucket <i> counts number of events where val[i - 1] < x <= val[i].
+	// The end histogram ends up being made into a cumulative one,
+	// but that's not how we store it here.
+	struct Bucket {
+		double val;
+		std::atomic<int64_t> count{0};
 	};
+	std::unique_ptr<Bucket[]> buckets;
+	size_t num_buckets;
+	std::atomic<double> sum{0.0};
+	std::atomic<int64_t> count_after_last_bucket{0};
+};
+
+// This is a pretty dumb streaming quantile class, but it's exact, and we don't have
+// too many values (typically one per frame, and one-minute interval), so we don't
+// need anything fancy.
+class Summary {
+public:
+	void init(const std::vector<double> &quantiles, double window_seconds);
+	void count_event(double val);
+	std::string serialize(Metrics::Laziness laziness, const std::string &name, const std::vector<std::pair<std::string, std::string>> &labels);
+
+private:
+	std::vector<double> quantiles;
+	std::chrono::duration<double> window;
 
 	mutable std::mutex mu;
-	std::map<std::string, Type> types;
-	std::vector<Metric> metrics;
-	std::vector<Histogram> histograms;
+	std::deque<std::pair<std::chrono::steady_clock::time_point, double>> values;
+	std::atomic<double> sum{0.0};
+	std::atomic<int64_t> count{0};
 };
 
 extern Metrics global_metrics;