Metrics: vend counters as strings to avoid making SWBProtocol part of the public interface for SwiftBuild

Author: mirza-garibovic

Sources/SwiftBuild/ConsoleCommands/SWBServiceConsoleBuildCommandProtocol.swift

@@ -14,7 +14,6 @@
 
 public import Foundation
 public import SWBProjectModel
-public import SWBProtocol
 
 import SWBUtil
 
@@ -169,10 +168,10 @@ public enum SwiftBuildMessage {
     }
 
     public struct BuildOperationMetrics {
-        let counters: [SWBProtocol.BuildOperationMetrics.Counter: Int]
+        public let counters: [String: Int]
 
         /// The key is the first component of task rule info, a.k.a. the rule info type
-        let taskCounters: [String: [SWBProtocol.BuildOperationMetrics.TaskCounter: Int]]
+        public let taskCounters: [String: [String: Int]]
     }
 
     public struct BuildCompletedInfo {

Sources/SwiftBuild/SWBuildMessage+Protocol.swift

@@ -46,11 +46,11 @@ extension SwiftBuildMessage {
     }
 
     init(_ message: BuildOperationEnded) {
-        let metrics: BuildOperationMetrics?
-        if let messageMetrics = message.metrics, !messageMetrics.counters.isEmpty {
-            metrics = .init(counters: messageMetrics.counters, taskCounters: messageMetrics.taskCounters)
-        } else {
-            metrics = nil
+        let metrics = message.metrics.map { metrics in
+            BuildOperationMetrics(
+                counters: Dictionary(uniqueKeysWithValues: metrics.counters.map { ($0.key.rawValue, $0.value) }),
+                taskCounters: metrics.taskCounters.mapValues { Dictionary(uniqueKeysWithValues: $0.map { ($0.key.rawValue, $0.value) }) }
+            )
         }
         self = .buildCompleted(.init(result: .init(message.status), metrics: metrics))
     }