All thread safe? 🤔

swift-server · Jan 2, 2019 · 32b1570 · 32b1570
1 parent a8e35e9
commit 32b1570
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 37 deletions.
diff --git a/Sources/Prometheus/MetricTypes/Counter.swift b/Sources/Prometheus/MetricTypes/Counter.swift
@@ -49,7 +49,7 @@ public class Counter<NumType: Numeric, Labels: MetricLabels>: Metric, Prometheus
                 output.append("# HELP \(self.name) \(help)")
             }
             output.append("# TYPE \(self.name) \(self._type)")
-
+            
             output.append("\(self.name) \(self.value)")
 
             self.metrics.forEach { (labels, value) in
@@ -67,17 +67,17 @@ public class Counter<NumType: Numeric, Labels: MetricLabels>: Metric, Prometheus
     ///     - amount: Amount to increment the counter with
     ///     - labels: Labels to attach to the value
     ///
-    /// - Returns: The new value
-    @discardableResult
-    public func inc(_ amount: NumType = 1, _ labels: Labels? = nil) -> NumType {
-        if let labels = labels {
-            var val = self.metrics[labels] ?? initialValue
-            val += amount
-            self.metrics[labels] = val
-            return val
-        } else {
-            self.value += amount
-            return self.value
+    public func inc(_ amount: NumType = 1, _ labels: Labels? = nil, _ done: @escaping (NumType) -> Void = { _ in }) {
+        prometheusQueue.async(flags: .barrier) {
+            if let labels = labels {
+                var val = self.metrics[labels] ?? self.initialValue
+                val += amount
+                self.metrics[labels] = val
+                done(val)
+            } else {
+                self.value += amount
+                done(self.value)
+            }
         }
     }
 

diff --git a/Sources/Prometheus/MetricTypes/Gauge.swift b/Sources/Prometheus/MetricTypes/Gauge.swift
@@ -67,15 +67,15 @@ public class Gauge<NumType: Numeric, Labels: MetricLabels>: Metric, PrometheusHa
     ///     - amount: Amount to set the gauge to
     ///     - labels: Labels to attach to the value
     ///
-    /// - Returns: The new value
-    @discardableResult
-    public func set(_ amount: NumType, _ labels: Labels? = nil) -> NumType {
+    public func set(_ amount: NumType, _ labels: Labels? = nil, _ done: @escaping (NumType) -> Void = { _ in }) {
+        prometheusQueue.async(flags: .barrier) {
         if let labels = labels {
             self.metrics[labels] = amount
-            return amount
+            done(amount)
         } else {
             self.value = amount
-            return self.value
+            done(self.value)
+        }
         }
     }
 
@@ -85,17 +85,17 @@ public class Gauge<NumType: Numeric, Labels: MetricLabels>: Metric, PrometheusHa
     ///     - amount: Amount to increment the Gauge with
     ///     - labels: Labels to attach to the value
     ///
-    /// - Returns: The new value
-    @discardableResult
-    public func inc(_ amount: NumType, _ labels: Labels? = nil) -> NumType {
+    public func inc(_ amount: NumType, _ labels: Labels? = nil, _ done: @escaping (NumType) -> Void = { _ in }) {
+        prometheusQueue.async(flags: .barrier) {
         if let labels = labels {
-            var val = self.metrics[labels] ?? initialValue
+            var val = self.metrics[labels] ?? self.initialValue
             val += amount
             self.metrics[labels] = val
-            return val
+            done(val)
         } else {
             self.value += amount
-            return self.value
+            done(self.value)
+        }
         }
     }
 
@@ -104,10 +104,10 @@ public class Gauge<NumType: Numeric, Labels: MetricLabels>: Metric, PrometheusHa
     /// - Parameters:
     ///     - labels: Labels to attach to the value
     ///
-    /// - Returns: The new value
-    @discardableResult
-    public func inc(_ labels: Labels? = nil) -> NumType {
-        return self.inc(1, labels)
+    public func inc(_ labels: Labels? = nil, _ done: @escaping (NumType) -> Void = { _ in }) {
+        self.inc(1, labels) {
+            done($0)
+        }
     }
 
     /// Decrements the Gauge
@@ -116,17 +116,17 @@ public class Gauge<NumType: Numeric, Labels: MetricLabels>: Metric, PrometheusHa
     ///     - amount: Amount to decrement the Gauge with
     ///     - labels: Labels to attach to the value
     ///
-    /// - Returns: The new value
-    @discardableResult
-    public func dec(_ amount: NumType, _ labels: Labels? = nil) -> NumType {
+    public func dec(_ amount: NumType, _ labels: Labels? = nil, _ done: @escaping (NumType) -> Void = { _ in }) {
+        prometheusQueue.async(flags: .barrier) {
         if let labels = labels {
-            var val = self.metrics[labels] ?? initialValue
+            var val = self.metrics[labels] ?? self.initialValue
             val -= amount
             self.metrics[labels] = val
-            return val
+            done(val)
         } else {
             self.value -= amount
-            return self.value
+            done(self.value)
+        }
         }
     }
 
@@ -135,10 +135,10 @@ public class Gauge<NumType: Numeric, Labels: MetricLabels>: Metric, PrometheusHa
     /// - Parameters:
     ///     - labels: Labels to attach to the value
     ///
-    /// - Returns: The new value
-    @discardableResult
-    public func dec(_ labels: Labels? = nil) -> NumType {
-        return self.dec(1, labels)
+    public func dec(_ labels: Labels? = nil, _ done: @escaping (NumType) -> Void = { _ in }) {
+        self.dec(1, labels) {
+            done($0)
+        }
     }
 
     /// Gets the value of the Gauge