Address feedback

Package.swift

@@ -16,7 +16,7 @@ let package = Package(
     dependencies: [
         .package(url: "https://github.com/vapor/vapor.git", from: "4.101.1"),
         .package(url: "https://github.com/apple/swift-nio.git", from: "2.65.0"),
-        .package(url: "https://github.com/apple/swift-metrics.git", "2.0.0"),
+        .package(url: "https://github.com/apple/swift-metrics.git", from: "2.5.0"),
     ],
     targets: [
         .target(

Package@swift-5.9.swift

@@ -11,18 +11,20 @@ let package = Package(
     ],
     products: [
         .library(name: "Queues", targets: ["Queues"]),
-        .library(name: "XCTQueues", targets: ["XCTQueues"])
+        .library(name: "XCTQueues", targets: ["XCTQueues"]),
     ],
     dependencies: [
         .package(url: "https://github.com/vapor/vapor.git", from: "4.101.1"),
         .package(url: "https://github.com/apple/swift-nio.git", from: "2.65.0"),
+        .package(url: "https://github.com/apple/swift-metrics.git", from: "2.5.0"),
     ],
     targets: [
         .target(
             name: "Queues",
             dependencies: [
                 .product(name: "Vapor", package: "vapor"),
                 .product(name: "NIOCore", package: "swift-nio"),
+                .product(name: "Metrics", package: "swift-metrics"),
             ],
             swiftSettings: swiftSettings
         ),

Sources/Queues/AsyncQueue.swift

@@ -83,7 +83,10 @@ extension Queue {
         logger.trace("Pusing job to queue")
         try await self.push(id).get()
         logger.info("Dispatched job")
-        Counter(label: "dispatched.jobs.counter", dimensions: [("queueName", self.queueName.string)]).increment()
+        Counter(label: "dispatched.jobs.counter", dimensions: [
+            ("queueName", self.queueName.string),
+            ("jobName", J.name),
+        ]).increment()
 
         await self.sendNotification(of: "dispatch", logger: logger) {
             try await $0.dispatched(job: .init(id: id.string, queueName: self.queueName.string, jobData: storage), eventLoop: self.eventLoop).get()

Sources/Queues/Queue.swift

@@ -96,12 +96,11 @@ extension Queue {
             logger.trace("Pusing job to queue")
             return self.push(id)
         }.flatMapWithEventLoop { _, eventLoop in
-            Counter(label: "dispatched.jobs.counter", dimensions: [("queueName", self.queueName.string)]).increment()
-            self.logger.info("Dispatched queue job", metadata: [
-                "job_id": .string(id.string),
-                "job_name": .string(job.name),
-                "queue": .string(self.queueName.string),
-            ])
+            Counter(label: "dispatched.jobs.counter", dimensions: [
+                ("queueName", self.queueName.string),
+                ("jobName", J.name),
+            ]).increment()
+            self.logger.info("Dispatched queue job")
             return self.sendNotification(of: "dispatch", logger: logger) {
                 $0.dispatched(job: .init(id: id.string, queueName: self.queueName.string, jobData: storage), eventLoop: eventLoop)
             }

Tests/QueuesTests/MetricsTests.swift

@@ -8,10 +8,10 @@ import XCTVapor
 
 final class MetricsTests: XCTestCase {
     var app: Application!
-    var metrics: CapturingMetricsSystem!
+    var metrics: TestMetrics!
 
     override func setUp() async throws {
-        self.metrics = CapturingMetricsSystem()
+        self.metrics = TestMetrics()
         MetricsSystem.bootstrapInternal(self.metrics)
 
         self.app = try await Application.make(.testing)
@@ -38,7 +38,7 @@ final class MetricsTests: XCTestCase {
 
         try await self.app.queues.queue.worker.run()
 
-        let timer = try XCTUnwrap(self.metrics.timers["some-id.jobDurationTimer"] as? TestTimer)
+        let timer = try XCTUnwrap(self.metrics.timers.first(where: { $0.label == "some-id.jobDurationTimer" }))
         let successDimension = try XCTUnwrap(timer.dimensions.first(where: { $0.0 == "success" }))
         let idDimension = try XCTUnwrap(timer.dimensions.first(where: { $0.0 == "id" }))
         XCTAssertEqual(successDimension.1, "true")
@@ -62,7 +62,7 @@ final class MetricsTests: XCTestCase {
         }
 
         try await self.app.queues.queue.worker.run()
-        let counter = try XCTUnwrap(self.metrics.counters["success.completed.jobs.counter"] as? TestCounter)
+        let counter = try XCTUnwrap(self.metrics.counters.first(where: { $0.label == "success.completed.jobs.counter" }))
         let queueNameDimension = try XCTUnwrap(counter.dimensions.first(where: { $0.0 == "queueName" }))
         XCTAssertEqual(queueNameDimension.1, self.app.queues.queue.queueName.string)
     }
@@ -82,7 +82,7 @@ final class MetricsTests: XCTestCase {
         }
 
         try await self.app.queues.queue.worker.run()
-        let counter = try XCTUnwrap(self.metrics.counters["error.completed.jobs.counter"] as? TestCounter)
+        let counter = try XCTUnwrap(self.metrics.counters.first(where: { $0.label == "error.completed.jobs.counter" }))
         let queueNameDimension = try XCTUnwrap(counter.dimensions.first(where: { $0.0 == "queueName" }))
         XCTAssertEqual(queueNameDimension.1, self.app.queues.queue.queueName.string)
     }
@@ -104,8 +104,10 @@ final class MetricsTests: XCTestCase {
 
         try await self.app.queues.queue.worker.run()
 
-        let counter = try XCTUnwrap(self.metrics.counters["dispatched.jobs.counter"] as? TestCounter)
+        let counter = try XCTUnwrap(self.metrics.counters.first(where: { $0.label == "dispatched.jobs.counter" }))
         let queueNameDimension = try XCTUnwrap(counter.dimensions.first(where: { $0.0 == "queueName" }))
+        let jobNameDimension = try XCTUnwrap(counter.dimensions.first(where: { $0.0 == "jobName" }))
         XCTAssertEqual(queueNameDimension.1, self.app.queues.queue.queueName.string)
+        XCTAssertEqual(jobNameDimension.1, MyAsyncJob.name)
     }
 }