Add histogram and summary support

2 files changed, 78 insertions, 10 deletions

diff --git a/Readme.textile b/Readme.textile
index 23ba4da..320a094 100644
--- a/Readme.textile
+++ b/Readme.textile
@@ -65,6 +65,20 @@ Each raider consists of:
 #* @labels@: A hash containing the metric labels
 #* @timestamp@: The timestamp when the metric was collected, defaults to the time @report!@ was called.
 
+For gauges and counters, the value is simply the vale of the metric.
+
+For histograms, the value is a hash containing:
+
+* @buckets@: A hash mapping the upper bound to the number of observations in the bucket
+* @count@: The total number of observations
+* @sum@: The sum of all observations
+
+For summaries, the value is a hash containing:
+
+* @quantiles@: A hash mapping the quantile to the value
+* @count@: The total number of observations
+* @sum@: The sum of all observations
+
 h4. Example
 
 bc.. class Test
diff --git a/lib/longboat/collector.rb b/lib/longboat/collector.rb
index e217ab4..7fd4f6f 100644
--- a/lib/longboat/collector.rb
+++ b/lib/longboat/collector.rb
@@ -46,27 +46,81 @@ module Longboat
       res = ""
       @metrics.each do |name, metric|
         res << ?\n unless res.empty?
+
         res << "#HELP #{name} #{metric[:help]}\n" unless metric[:help].nil?
         res << "#TYPE #{name} #{metric[:type]}\n" unless metric[:type].nil?
 
-        metric.each do |labels, value|
-          next if labels == :help
-          next if labels == :type
-
-          labellist = []
-          labels.each do |k, v|
-            labellist << "#{k}=\"#{v}\""
+        case metric[:type]
+        when "gauge", "counter"
+          metric.each do |labelset, value|
+            next if labelset == :help
+            next if labelset == :type
+            res << stringify_gaugecounter(name, labelset, value[:value], value[:timestamp])
+          end
+        when "histogram"
+          metric.each do |labelset, value|
+            next if labelset == :help
+            next if labelset == :type
+            res << stringify_histogram(name, labelset, value[:value], value[:timestamp])
+          end
+        when "summary"
+          metric.each do |labelset, value|
+            next if labelset == :help
+            next if labelset == :type
+            res << stringify_summary(name, labelset, value[:value], value[:timestamp])
           end
-          labellist = labellist.join(",")
-
-          res << "#{name}{#{labellist}} #{value[:value]} #{(value[:timestamp].to_f * 1000).to_i}\n"
         end
       end
+
       res
     end
 
     private
 
+    def stringify_gaugecounter(name, labelset, value, timestamp)
+      labels = prometheus_labels(labelset)
+      timestamp = (timestamp.to_f * 1000).to_i
+
+      "#{name}{#{labels}} #{value} #{timestamp}\n"
+    end
+
+    def stringify_histogram(name, labelset, data, timestamp)
+      res = ""
+
+      data[:buckets].each do |bkt, cnt|
+        res << stringify_gaugecounter("#{name}_bucket", labelset.merge({le: bkt.to_s}), cnt, timestamp)
+      end
+
+      res << stringify_gaugecounter("#{name}_bucket", labelset.merge({le: "+Inf"}), data[:count], timestamp)
+      res << stringify_gaugecounter("#{name}_count", labelset, data[:count], timestamp)
+      res << stringify_gaugecounter("#{name}_sum", labelset, data[:sum], timestamp)
+      
+      res
+    end
+
+    def stringify_summary(name, labelset, data, timestamp)
+      res = ""
+
+      data[:quantiles].each do |qtl, val|
+        res << stringify_gaugecounter(name, labelset.merge({quantile: qtl.to_s}), val, timestamp)
+      end
+
+      res << stringify_gaugecounter("#{name}_count", labelset, data[:count], timestamp)
+      res << stringify_gaugecounter("#{name}_sum", labelset, data[:sum], timestamp)
+      
+      res
+    end
+
+    def prometheus_labels(labelset)
+      labellist = []
+
+      labelset.each do |k, v|
+        labellist << "#{k}=\"#{v}\""
+      end
+
+      labellist.join(",")
+    end
+
     def prefix(name)
       "#{@config[:metric_prefix]}#{name}"
     end