From 9907101ff8bc7b934458dc58ce6e3195931439ed Mon Sep 17 00:00:00 2001 From: tomer doron Date: Mon, 14 Jan 2019 02:00:18 -0800 Subject: [PATCH] format --- Sources/CoreMetrics/Metrics.swift | 12 ++++---- Sources/Examples/SimpleMetricsLibrary.swift | 34 ++++++++++----------- Tests/MetricsTests/CoreMetricsTests.swift | 6 ++-- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/Sources/CoreMetrics/Metrics.swift b/Sources/CoreMetrics/Metrics.swift index cf2634d..84d677f 100644 --- a/Sources/CoreMetrics/Metrics.swift +++ b/Sources/CoreMetrics/Metrics.swift @@ -137,18 +137,18 @@ private final class CachingMetricsHandler: MetricsHandler { } public func makeCounter(label: String, dimensions: [(String, String)]) -> Counter { - return counters.getOrSet(label: label, dimensions:dimensions, maker: self.wrapped.makeCounter) + return self.counters.getOrSet(label: label, dimensions: dimensions, maker: self.wrapped.makeCounter) } public func makeRecorder(label: String, dimensions: [(String, String)], aggregate: Bool) -> Recorder { let maker = { (label: String, dimensions: [(String, String)]) -> Recorder in self.wrapped.makeRecorder(label: label, dimensions: dimensions, aggregate: aggregate) } - return recorders.getOrSet(label: label, dimensions:dimensions, maker: maker) + return self.recorders.getOrSet(label: label, dimensions: dimensions, maker: maker) } public func makeTimer(label: String, dimensions: [(String, String)]) -> Timer { - return timers.getOrSet(label: label, dimensions:dimensions, maker: self.wrapped.makeTimer) + return self.timers.getOrSet(label: label, dimensions: dimensions, maker: self.wrapped.makeTimer) } private class Cache { @@ -157,9 +157,9 @@ private final class CachingMetricsHandler: MetricsHandler { // once we see how real life workloads behaves // for example, for short opetations like hashmap lookup mutexes are worst than r/w locks in 99% reads, but better than them in mixed r/w mode private let lock = Lock() - + func getOrSet(label: String, dimensions: [(String, String)], maker: (String, [(String, String)]) -> T) -> T { - let key = self.fqn(label: label, dimensions: dimensions) + let key = self.fqn(label: label, dimensions: dimensions) return self.lock.withLock { if let item = items[key] { return item @@ -170,7 +170,7 @@ private final class CachingMetricsHandler: MetricsHandler { } } } - + private func fqn(label: String, dimensions: [(String, String)]) -> String { return [[label], dimensions.compactMap { "\($0.0).\($0.1)" }].flatMap { $0 }.joined(separator: ".") } diff --git a/Sources/Examples/SimpleMetricsLibrary.swift b/Sources/Examples/SimpleMetricsLibrary.swift index 0b3eadc..1f7907b 100644 --- a/Sources/Examples/SimpleMetricsLibrary.swift +++ b/Sources/Examples/SimpleMetricsLibrary.swift @@ -2,23 +2,23 @@ import Metrics class SimpleMetricsLibrary: MetricsHandler { init() {} - + func makeCounter(label: String, dimensions: [(String, String)]) -> Counter { return ExampleCounter(label, dimensions) } - + func makeRecorder(label: String, dimensions: [(String, String)], aggregate: Bool) -> Recorder { - let maker:(String, [(String, String)]) -> Recorder = aggregate ? ExampleRecorder.init : ExampleGauge.init + let maker: (String, [(String, String)]) -> Recorder = aggregate ? ExampleRecorder.init : ExampleGauge.init return maker(label, dimensions) } - + func makeTimer(label: String, dimensions: [(String, String)]) -> Timer { return ExampleTimer(label, dimensions) } - + private class ExampleCounter: Counter { init(_: String, _: [(String, String)]) {} - + let lock = NSLock() var value: Int64 = 0 func increment(_ value: DataType) { @@ -27,16 +27,16 @@ class SimpleMetricsLibrary: MetricsHandler { } } } - + private class ExampleRecorder: Recorder { init(_: String, _: [(String, String)]) {} - + private let lock = NSLock() var values = [(Int64, Double)]() func record(_ value: DataType) { self.record(Double(value)) } - + func record(_ value: DataType) { // this may loose percision, but good enough as an example let v = Double(value) @@ -49,43 +49,43 @@ class SimpleMetricsLibrary: MetricsHandler { if 0 == self._max || v > self._max { self._max = v } } } - + var _sum: Double = 0 var sum: Double { return self.lock.withLock { _sum } } - + private var _count: Int = 0 var count: Int { return self.lock.withLock { _count } } - + private var _min: Double = 0 var min: Double { return self.lock.withLock { _min } } - + private var _max: Double = 0 var max: Double { return self.lock.withLock { _max } } } - + private class ExampleGauge: Recorder { init(_: String, _: [(String, String)]) {} - + let lock = NSLock() var _value: Double = 0 func record(_ value: DataType) { self.record(Double(value)) } - + func record(_ value: DataType) { // this may loose percision but good enough as an example self.lock.withLock { _value = Double(value) } } } - + private class ExampleTimer: ExampleRecorder, Timer { func recordNanoseconds(_ duration: Int64) { super.record(duration) diff --git a/Tests/MetricsTests/CoreMetricsTests.swift b/Tests/MetricsTests/CoreMetricsTests.swift index bc0b60d..c7c7f0d 100644 --- a/Tests/MetricsTests/CoreMetricsTests.swift +++ b/Tests/MetricsTests/CoreMetricsTests.swift @@ -219,7 +219,7 @@ class MetricsTests: XCTestCase { XCTAssertEqual(counter3.label, name3, "expected label to match") XCTAssertNotEqual(counter3, counter, "expected caching to work with dimensions") } - + func testCachingWithDimensions() throws { // bootstrap with our test metrics let metrics = TestMetrics() @@ -246,14 +246,14 @@ class MetricsTests: XCTestCase { XCTAssertNotEqual(counter3, counter, "expected caching to work with dimensions") // different dimensions "key" let name4 = name - let dimensions4 = dimensions.map{ ($0.0 + "-test" , $0.1) } + let dimensions4 = dimensions.map { ($0.0 + "-test", $0.1) } let counter4 = Metrics.global.makeCounter(label: name4, dimensions: dimensions4) as! TestCounter XCTAssertEqual(counter4.label, name4, "expected label to match") XCTAssertEqual(counter4.dimensions.description, dimensions4.description, "expected dimensions to match") XCTAssertNotEqual(counter4, counter, "expected caching to work with dimensions") // different dimensions "value" let name5 = name - let dimensions5 = dimensions.map{ ($0.0, $0.1 + "-test") } + let dimensions5 = dimensions.map { ($0.0, $0.1 + "-test") } let counter5 = Metrics.global.makeCounter(label: name5, dimensions: dimensions5) as! TestCounter XCTAssertEqual(counter5.label, name5, "expected label to match") XCTAssertEqual(counter5.dimensions.description, dimensions5.description, "expected dimensions to match")