Wrap summary

Author: MrLotU

Sources/Prometheus/MetricTypes/Histogram.swift

@@ -1,4 +1,4 @@
-public var defaultBuckets = [0.005, 0.01, 0.025, 0.05, 0.075, 0.1, 0.25, 0.5, 0.75, 1.0, 2.5, 5.0, 7.5, 10.0, Double.greatestFiniteMagnitude]
+private var defaultBuckets = [0.005, 0.01, 0.025, 0.05, 0.075, 0.1, 0.25, 0.5, 0.75, 1.0, 2.5, 5.0, 7.5, 10.0, Double.greatestFiniteMagnitude]
 
 public protocol HistogramLabels: MetricLabels {
     var le: String { get set }
@@ -24,7 +24,7 @@ public class Histogram<NumType: DoubleRepresentable, Labels: HistogramLabels>: M
 
     private var total: Counter<NumType, EmptyCodable>
 
-    public init(_ name: String, _ help: String? = nil, _ labels: Labels = Labels(), _ buckets: [Double] = defaultBuckets) {
+    internal init(_ name: String, _ help: String? = nil, _ labels: Labels = Labels(), _ buckets: [Double] = defaultBuckets) {
         self.name = name
         self.help = help
 

Sources/Prometheus/MetricTypes/Summary.swift

@@ -1,3 +1,5 @@
+public var defaultQuantiles = [0.01, 0.05, 0.5, 0.9, 0.95, 0.99, 0.999]
+
 public protocol SummaryLabels: MetricLabels {
     var quantile: String { get set }
 }
@@ -22,14 +24,18 @@ public class Summary<NumType: DoubleRepresentable, Labels: SummaryLabels>: Metri
 
     private var values: [NumType] = []
 
-    public init(_ name: String, _ help: String? = nil, _ labels: Labels = Labels()) {
+    private var quantiles: [Double]
+    
+    public init(_ name: String, _ help: String? = nil, _ quantiles: [Double] = defaultQuantiles, _ labels: Labels = Labels()) {
         self.name = name
         self.help = help
 
         self.sum = .init("\(self.name)_sum")
 
         self.count = .init("\(self.name)_count")
 
+        self.quantiles = quantiles
+        
         self.labels = labels
     }
 
@@ -41,9 +47,7 @@ public class Summary<NumType: DoubleRepresentable, Labels: SummaryLabels>: Metri
         }
         output.append("# TYPE \(name) summary")
 
-        let quantiles = [0.5, 0.9, 0.99]
-        
-        calculateQuantiles(quantiles: quantiles, values: values.map { $0.doubleValue }).forEach { (arg) in
+        calculateQuantiles(quantiles: quantiles, values: values.map { $0.doubleValue }).sorted { $0.key < $1.key }.forEach { (arg) in
             let (q, v) = arg
             self.labels.quantile = "\(q)"
             let labelsString = encodeLabels(self.labels)

Sources/PrometheusExample/main.swift

@@ -60,11 +60,6 @@ let codable2 = MyCodable("Thing2")
 //
 //let summary = Summary<Int, SummaryCodable>("my_summary", "Just a summary")
 //
-//summary.observe(4)
-//summary.observe(3)
-//summary.observe(1)
-//summary.observe(3)
-//summary.observe(9)
-//summary.observe(5)
+//summary.observe(Int.random(in: 1...10000))
 //
 //print(summary.getMetric())