fix: fix response time for consul

LLCFreedom-Space · Apr 20, 2024 · d222e12 · d222e12
1 parent 969d28f
commit d222e12
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 12 deletions.
diff --git a/Sources/HealthChecks/ConsulHealthChecks/ConsulHealthChecks.swift b/Sources/HealthChecks/ConsulHealthChecks/ConsulHealthChecks.swift
@@ -113,8 +113,8 @@ public struct ConsulHealthChecks: ConsulHealthChecksProtocol {
         return HealthCheckItem(
             componentId: app.consulConfig?.id,
             componentType: .component,
-            observedValue: response.status == .ok ? Date().timeIntervalSince1970 - start : 0,
-            observedUnit: "s",
+            observedValue: response.status == .ok ? (Date().timeIntervalSince1970 - start) * 1000 : 0,
+            observedUnit: "ms",
             status: response.status == .ok ? .pass : .fail,
             time: response.status == .ok ? app.dateTimeISOFormat.string(from: Date()) : nil,
             output: response.status != .ok ? "Error response from consul, with http status - \(response.status)" : nil,

diff --git a/Tests/HealthChecksTests/MongoHealthChecksTests.swift b/Tests/HealthChecksTests/MongoHealthChecksTests.swift
@@ -41,7 +41,6 @@ final class MongoHealthChecksTests: XCTestCase {
         let result = await app.mongoHealthChecks?.connection()
         XCTAssertEqual(result?.componentType, .datastore)
         XCTAssertNotEqual(result?.observedValue, 1.0)
-        XCTAssertEqual(result?.observedUnit, "s")
         XCTAssertEqual(result?.status, .pass)
         XCTAssertNil(result?.affectedEndpoints)
         XCTAssertNil(result?.output)
@@ -61,7 +60,7 @@ final class MongoHealthChecksTests: XCTestCase {
         let result = await app.mongoHealthChecks?.responseTime()
         XCTAssertEqual(result?.componentType, .datastore)
         XCTAssertNotEqual(result?.observedValue, 1.0)
-        XCTAssertEqual(result?.observedUnit, "s")
+        XCTAssertEqual(result?.observedUnit, "ms")
         XCTAssertEqual(result?.status, .pass)
         XCTAssertNil(result?.affectedEndpoints)
         XCTAssertNil(result?.output)
@@ -86,7 +85,6 @@ final class MongoHealthChecksTests: XCTestCase {
         let mongoConnections = result?["\(ComponentName.mongo):\(MeasurementType.connections)"]
         XCTAssertEqual(mongoConnections?.componentType, .datastore)
         XCTAssertNotEqual(mongoConnections?.observedValue, 1.0)
-        XCTAssertEqual(mongoConnections?.observedUnit, "s")
         XCTAssertEqual(mongoConnections?.status, .pass)
         XCTAssertNil(mongoConnections?.affectedEndpoints)
         XCTAssertNil(mongoConnections?.output)

diff --git a/Tests/HealthChecksTests/PostgresHealthChecksTests.swift b/Tests/HealthChecksTests/PostgresHealthChecksTests.swift
@@ -39,7 +39,6 @@ final class PostgresHealthChecksTests: XCTestCase {
         let result = await app.psqlHealthChecks?.connection()
         XCTAssertEqual(result?.componentType, .datastore)
         XCTAssertNotEqual(result?.observedValue, 1.0)
-        XCTAssertEqual(result?.observedUnit, "s")
         XCTAssertEqual(result?.status, .pass)
         XCTAssertNil(result?.affectedEndpoints)
         XCTAssertNil(result?.output)
@@ -59,7 +58,7 @@ final class PostgresHealthChecksTests: XCTestCase {
         let result = await app.psqlHealthChecks?.responseTime()
         XCTAssertEqual(result?.componentType, .datastore)
         XCTAssertNotEqual(result?.observedValue, 1.0)
-        XCTAssertEqual(result?.observedUnit, "s")
+        XCTAssertEqual(result?.observedUnit, "ms")
         XCTAssertEqual(result?.status, .pass)
         XCTAssertNil(result?.affectedEndpoints)
         XCTAssertNil(result?.output)
@@ -84,7 +83,6 @@ final class PostgresHealthChecksTests: XCTestCase {
         let psqlConnections = result?["\(ComponentName.postgresql):\(MeasurementType.connections)"]
         XCTAssertEqual(psqlConnections?.componentType, .datastore)
         XCTAssertNotEqual(psqlConnections?.observedValue, 1.0)
-        XCTAssertEqual(psqlConnections?.observedUnit, "s")
         XCTAssertEqual(psqlConnections?.status, .pass)
         XCTAssertNil(psqlConnections?.affectedEndpoints)
         XCTAssertNil(psqlConnections?.output)

diff --git a/Tests/HealthChecksTests/RedisHealthChecksTests.swift b/Tests/HealthChecksTests/RedisHealthChecksTests.swift
@@ -39,7 +39,6 @@ final class RedisHealthChecksTests: XCTestCase {
         let result = await app.redisHealthChecks?.connection()
         XCTAssertEqual(result?.componentType, .datastore)
         XCTAssertNotEqual(result?.observedValue, 1.0)
-        XCTAssertEqual(result?.observedUnit, "s")
         XCTAssertEqual(result?.status, .pass)
         XCTAssertNil(result?.affectedEndpoints)
         XCTAssertNil(result?.output)
@@ -59,10 +58,10 @@ final class RedisHealthChecksTests: XCTestCase {
 
         app.redisRequest = RedisRequestMock()
         app.redisHealthChecks = RedisHealthChecks(app: app)
-        let result = await app.redisHealthChecks?.connection()
+        let result = await app.redisHealthChecks?.responseTime()
         XCTAssertEqual(result?.componentType, .datastore)
         XCTAssertNotEqual(result?.observedValue, 1.0)
-        XCTAssertEqual(result?.observedUnit, "s")
+        XCTAssertEqual(result?.observedUnit, "ms")
         XCTAssertEqual(result?.status, .pass)
         XCTAssertNil(result?.affectedEndpoints)
         XCTAssertNil(result?.output)
@@ -86,7 +85,6 @@ final class RedisHealthChecksTests: XCTestCase {
         let redisConnections = result?["\(ComponentName.redis):\(MeasurementType.connections)"]
         XCTAssertEqual(redisConnections?.componentType, .datastore)
         XCTAssertNotEqual(redisConnections?.observedValue, 1.0)
-        XCTAssertEqual(redisConnections?.observedUnit, "s")
         XCTAssertEqual(redisConnections?.status, .pass)
         XCTAssertNil(redisConnections?.affectedEndpoints)
         XCTAssertNil(redisConnections?.output)