Fix conversion factor in timer metrics (#8)

* Fix conversion factor in timer
* Add tests for timers with various conversion factors

Author: Firehed

Sources/StatsdClient/StatsdClient.swift

@@ -226,7 +226,7 @@ private final class StatsdTimer: TimerHandler, Equatable {
         // https://github.com/b/statsd_spec#timers
         // A timer is a measure of the number of milliseconds elapsed between a start and end time, for example the time to complete rendering of a web page for a user.
         // Valid timer values are in the range [0, 2^64^).
-        let value = Swift.max(0, duration / 1000)
+        let value = Swift.max(0.0, Double(duration) / 1_000_000.0)
         _ = self.client.emit(Metric(name: self.id, value: value, type: .timer))
     }
 

Tests/StatsdClientTests/StatsdClientTests+XCTest.swift

@@ -27,7 +27,10 @@ extension StatsdClientTests {
         return [
             ("testCounter", testCounter),
             ("testCounterOverflow", testCounterOverflow),
-            ("testTimer", testTimer),
+            ("testTimerNanoseconds", testTimerNanoseconds),
+            ("testTimerMicroseconds", testTimerMicroseconds),
+            ("testTimerMilliseconds", testTimerMilliseconds),
+            ("testTimerSeconds", testTimerSeconds),
             ("testGaugeInteger", testGaugeInteger),
             ("testGaugeDouble", testGaugeDouble),
             ("testRecorderInteger", testRecorderInteger),

Tests/StatsdClientTests/StatsdClientTests.swift

@@ -104,9 +104,9 @@ class StatsdClientTests: XCTestCase {
         try! server.shutdown()
     }
 
-    func testTimer() {
+    func testTimerNanoseconds() {
         let id = NSUUID().uuidString
-        let value = Int64.random(in: 1000 ... 1_000_000)
+        let value = 1_234_567
 
         let server = TestServer(host: host, port: port)
         try! server.connect().wait()
@@ -115,7 +115,7 @@ class StatsdClientTests: XCTestCase {
         group.enter()
         server.onData { data in
             defer { group.leave() }
-            XCTAssertEqual(data, "\(id):\(value / 1000)|ms", "expected entries to match")
+            XCTAssertEqual(data, "\(id):1.234567|ms", "expected entries to match")
         }
 
         let timer = Timer(label: id)
@@ -131,6 +131,87 @@ class StatsdClientTests: XCTestCase {
         try! server.shutdown()
     }
 
+    func testTimerMicroseconds() {
+        let id = NSUUID().uuidString
+        let value = 1234
+
+        let server = TestServer(host: host, port: port)
+        try! server.connect().wait()
+
+        let group = DispatchGroup()
+        group.enter()
+        server.onData { data in
+            defer { group.leave() }
+            XCTAssertEqual(data, "\(id):1.234|ms", "expected entries to match")
+        }
+
+        let timer = Timer(label: id)
+        timer.recordMicroseconds(value)
+
+        switch group.wait(timeout: DispatchTime.now() + .seconds(1)) {
+        case .timedOut:
+            XCTFail("timeout")
+        case .success:
+            break
+        }
+
+        try! server.shutdown()
+    }
+
+    func testTimerMilliseconds() {
+        let id = NSUUID().uuidString
+        let value = 1.234
+
+        let server = TestServer(host: host, port: port)
+        try! server.connect().wait()
+
+        let group = DispatchGroup()
+        group.enter()
+        server.onData { data in
+            defer { group.leave() }
+            XCTAssertEqual(data, "\(id):1.234|ms", "expected entries to match")
+        }
+
+        let timer = Timer(label: id)
+        timer.recordMilliseconds(value)
+
+        switch group.wait(timeout: DispatchTime.now() + .seconds(1)) {
+        case .timedOut:
+            XCTFail("timeout")
+        case .success:
+            break
+        }
+
+        try! server.shutdown()
+    }
+
+    func testTimerSeconds() {
+        let id = NSUUID().uuidString
+        let value = 1.234
+
+        let server = TestServer(host: host, port: port)
+        try! server.connect().wait()
+
+        let group = DispatchGroup()
+        group.enter()
+        server.onData { data in
+            defer { group.leave() }
+            XCTAssertEqual(data, "\(id):1234|ms", "expected entries to match")
+        }
+
+        let timer = Timer(label: id)
+        timer.recordSeconds(value)
+
+        switch group.wait(timeout: DispatchTime.now() + .seconds(1)) {
+        case .timedOut:
+            XCTFail("timeout")
+        case .success:
+            break
+        }
+
+        try! server.shutdown()
+    }
+
     func testGaugeInteger() {
         let id = NSUUID().uuidString
         let value = Int64.random(in: 0 ... 1000)

Tests/StatsdClientTests/XCTestManifests.swift

@@ -27,7 +27,10 @@ extension StatsdClientTests {
         ("testGaugeInteger", testGaugeInteger),
         ("testRecorderDouble", testRecorderDouble),
         ("testRecorderInteger", testRecorderInteger),
-        ("testTimer", testTimer),
+        ("testTimerMicroseconds", testTimerMicroseconds),
+        ("testTimerMilliseconds", testTimerMilliseconds),
+        ("testTimerNanoseconds", testTimerNanoseconds),
+        ("testTimerSeconds", testTimerSeconds),
     ]
 }