Add Prom instance to all metrics, internalise some things

Author: MrLotU

Sources/Prometheus/MetricTypes/Counter.swift

@@ -1,15 +1,18 @@
-public class Counter<NumType: Numeric, Labels: MetricLabels>: Metric {
+public class Counter<NumType: Numeric, Labels: MetricLabels>: Metric, PrometheusHandled {
+    internal let prometheus: Prometheus
+    
     public let name: String
     public let help: String?
 
     internal var value: NumType
 
     internal var metrics: [Labels: NumType] = [:]
 
-    public init(_ name: String, _ help: String? = nil, _ initialValue: NumType = 0) {
+    internal init(_ name: String, _ help: String? = nil, _ initialValue: NumType = 0, _ p: Prometheus) {
         self.name = name
         self.help = help
         self.value = initialValue
+        self.prometheus = p
     }
 
     public func getMetric() -> String {

Sources/Prometheus/MetricTypes/Gauge.swift

@@ -1,15 +1,18 @@
-public class Gauge<NumType: Numeric, Labels: MetricLabels>: Metric {
+public class Gauge<NumType: Numeric, Labels: MetricLabels>: Metric, PrometheusHandled {
+    internal let prometheus: Prometheus
+    
     public let name: String
     public let help: String?
 
     private var value: NumType
 
     private var metrics: [Labels: NumType] = [:]
 
-    public init(_ name: String, _ help: String? = nil, _ initialValue: NumType = 0) {
+    internal init(_ name: String, _ help: String? = nil, _ initialValue: NumType = 0, _ p: Prometheus) {
         self.name = name
         self.help = help
         self.value = initialValue
+        self.prometheus = p
     }
 
     public func getMetric() -> String {

Sources/Prometheus/MetricTypes/Histogram.swift

@@ -11,9 +11,10 @@ extension HistogramLabels {
     }
 }
 
-public class Histogram<NumType: DoubleRepresentable, Labels: HistogramLabels>: Metric {
-    public let name: String
+public class Histogram<NumType: DoubleRepresentable, Labels: HistogramLabels>: Metric, PrometheusHandled {
+    internal let prometheus: Prometheus
 
+    public let name: String
     public let help: String?
 
     private var buckets: [Counter<NumType, EmptyCodable>] = []
@@ -24,18 +25,20 @@ public class Histogram<NumType: DoubleRepresentable, Labels: HistogramLabels>: M
 
     private let total: Counter<NumType, EmptyCodable>
 
-    internal 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, _ p: Prometheus) {
         self.name = name
         self.help = help
 
-        self.total = .init("\(self.name)_sum")
+        self.prometheus = p
+        
+        self.total = .init("\(self.name)_sum", nil, 0, p)
 
         self.labels = labels
 
         self.upperBounds = buckets
 
         buckets.forEach { _ in
-            self.buckets.append(.init("\(name)_bucket", nil, 0))
+            self.buckets.append(.init("\(name)_bucket", nil, 0, p))
         }
     }
 

Sources/Prometheus/MetricTypes/Metric.swift

@@ -5,6 +5,10 @@ public protocol Metric {
     func getMetric() -> String
 }
 
+internal protocol PrometheusHandled {
+    var prometheus: Prometheus { get }
+}
+
 public protocol MetricLabels: Codable, Hashable {
     init()
 }

Sources/Prometheus/MetricTypes/Summary.swift

@@ -11,9 +11,10 @@ extension SummaryLabels {
     }
 }
 
-public class Summary<NumType: DoubleRepresentable, Labels: SummaryLabels>: Metric {
-    public let name: String
+public class Summary<NumType: DoubleRepresentable, Labels: SummaryLabels>: Metric, PrometheusHandled {
+    internal let prometheus: Prometheus
 
+    public let name: String
     public let help: String?
 
     private var labels: Labels
@@ -26,13 +27,15 @@ public class Summary<NumType: DoubleRepresentable, Labels: SummaryLabels>: Metri
 
     private var quantiles: [Double]
 
-    internal init(_ name: String, _ help: String? = nil, _ quantiles: [Double] = defaultQuantiles, _ labels: Labels = Labels()) {
+    internal init(_ name: String, _ help: String? = nil, _ quantiles: [Double] = defaultQuantiles, _ labels: Labels = Labels(), _ p: Prometheus) {
         self.name = name
         self.help = help
 
-        self.sum = .init("\(self.name)_sum")
+        self.prometheus = p
+        
+        self.sum = .init("\(self.name)_sum", nil, 0, p)
 
-        self.count = .init("\(self.name)_count")
+        self.count = .init("\(self.name)_count", nil, 0, p)
 
         self.quantiles = quantiles
 

Sources/Prometheus/Prometheus.swift

@@ -27,7 +27,7 @@ public class Prometheus {
         initialValue: T = 0,
         withLabelType labelType: U.Type) -> Counter<T, U>
     {
-        let counter = Counter<T, U>(name, helpText, initialValue)
+        let counter = Counter<T, U>(name, helpText, initialValue, self)
         self.metrics.append(counter)
         return counter
     }
@@ -69,7 +69,7 @@ public class Prometheus {
         initialValue: T = 0,
         withLabelType labelType: U.Type) -> Gauge<T, U>
     {
-        let gauge = Gauge<T, U>(name, helpText, initialValue)
+        let gauge = Gauge<T, U>(name, helpText, initialValue, self)
         self.metrics.append(gauge)
         return gauge
     }
@@ -111,7 +111,7 @@ public class Prometheus {
         buckets: [Double] = defaultBuckets,
         labels: U) -> Histogram<T, U>
     {
-        let histogram = Histogram<T, U>(name, helpText, labels, buckets)
+        let histogram = Histogram<T, U>(name, helpText, labels, buckets, self)
         self.metrics.append(histogram)
         return histogram
     }
@@ -143,7 +143,7 @@ public class Prometheus {
         quantiles: [Double] = defaultQuantiles,
         labels: U) -> Summary<T, U>
     {
-        let summary = Summary<T, U>(name, helpText, quantiles, labels)
+        let summary = Summary<T, U>(name, helpText, quantiles, labels, self)
         metrics.append(summary)
         return summary
     }