Merge pull request #55 from MrLotU/feature/floating-point-counter

Add floating point counter

Author: ktoso

Package.resolved

@@ -6,8 +6,8 @@
         "repositoryURL": "https://github.com/apple/swift-metrics.git",
         "state": {
           "branch": null,
-          "revision": "708b960b4605abb20bc55d65abf6bad607252200",
-          "version": "2.0.0"
+          "revision": "3edd2f57afc4e68e23c3e4956bc8b65ca6b5b2ff",
+          "version": "2.2.0"
         }
       },
       {

Package.swift

@@ -13,7 +13,7 @@ let package = Package(
             targets: ["PrometheusExample"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/apple/swift-metrics.git", from: "2.0.0"),
+        .package(url: "https://github.com/apple/swift-metrics.git", from: "2.2.0"),
         .package(url: "https://github.com/apple/swift-nio.git", from: "2.0.0"),
     ],
     targets: [

Sources/Prometheus/PrometheusMetrics.swift

@@ -20,6 +20,26 @@ private class MetricsCounter: CounterHandler {
     func reset() { }
 }
 
+private class MetricsFloatingPointCounter: FloatingPointCounterHandler {
+    let counter: PromCounter<Double, DimensionLabels>
+    let labels: DimensionLabels?
+
+    internal init(counter: PromCounter<Double, DimensionLabels>, dimensions: [(String, String)]) {
+        self.counter = counter
+        guard !dimensions.isEmpty else {
+            labels = nil
+            return
+        }
+        self.labels = DimensionLabels(dimensions)
+    }
+
+    func increment(by: Double) {
+        self.counter.inc(by, labels)
+    }
+
+    func reset() { }
+}
+
 private class MetricsGauge: RecorderHandler {
     let gauge: PromGauge<Double, DimensionLabels>
     let labels: DimensionLabels?
@@ -211,6 +231,11 @@ public struct PrometheusMetricsFactory: PrometheusWrappedMetricsFactory {
         guard let handler = handler as? MetricsCounter else { return }
         client.removeMetric(handler.counter)
     }
+
+    public func destroyFloatingPointCounter(_ handler: FloatingPointCounterHandler) {
+        guard let handler = handler as? MetricsFloatingPointCounter else { return }
+        client.removeMetric(handler.counter)
+    }
 
     public func destroyRecorder(_ handler: RecorderHandler) {
         if let handler = handler as? MetricsGauge {
@@ -237,6 +262,12 @@ public struct PrometheusMetricsFactory: PrometheusWrappedMetricsFactory {
         let counter = client.createCounter(forType: Int64.self, named: label, withLabelType: DimensionLabels.self)
         return MetricsCounter(counter: counter, dimensions: dimensions)
     }
+
+    public func makeFloatingPointCounter(label: String, dimensions: [(String, String)]) -> FloatingPointCounterHandler {
+        let label = configuration.labelSanitizer.sanitize(label)
+        let counter = client.createCounter(forType: Double.self, named: label, withLabelType: DimensionLabels.self)
+        return MetricsFloatingPointCounter(counter: counter, dimensions: dimensions)
+    }
 
     public func makeRecorder(label: String, dimensions: [(String, String)], aggregate: Bool) -> RecorderHandler {
         let label = configuration.labelSanitizer.sanitize(label)

Tests/SwiftPrometheusTests/PrometheusMetricsTests.swift

@@ -45,6 +45,22 @@ final class PrometheusMetricsTests: XCTestCase {
         """)
     }
 
+    func testFloatingPointCounter() {
+        let counter = FloatingPointCounter(label: "my_fp_counter")
+        counter.increment(by: 3.5)
+        let counterTwo = FloatingPointCounter(label: "my_fp_counter", dimensions: [("myValue", "labels")])
+        counterTwo.increment(by: 10.4)
+
+        let promise = self.eventLoop.makePromise(of: String.self)
+        prom.collect(promise.succeed)
+
+        XCTAssertEqual(try! promise.futureResult.wait(), """
+        # TYPE my_fp_counter counter
+        my_fp_counter 3.5
+        my_fp_counter{myValue=\"labels\"} 10.4\n
+        """)
+    }
+
     func testMetricDestroying() {
         let counter = Counter(label: "my_counter")
         counter.increment()