Add diagnosticsEngine parameter to RegistryManager

Author: mattt

Sources/PackageRegistry/RegistryManager.swift

@@ -33,25 +33,26 @@ public final class RegistryManager {
         return ZipArchiver(fileSystem: fileSystem)
     }
 
-    internal static var clientFactory: () -> HTTPClientProtocol = {
+    internal static var clientFactory: (DiagnosticsEngine?) -> HTTPClientProtocol = { diagnosticEngine in
         var configuration = HTTPClientConfiguration()
         configuration.followRedirects = false
 
-        return HTTPClient(configuration: configuration, handler: nil, diagnosticsEngine: nil)
+        return HTTPClient(configuration: configuration, handler: nil, diagnosticsEngine: diagnosticEngine)
     }
 
     private static var cache = ThreadSafeKeyValueStore<URL, RegistryManager>()
 
     private let registryBaseURL: Foundation.URL
     private let client: HTTPClientProtocol
 
-    init(registryBaseURL: Foundation.URL) {
+    init(registryBaseURL: Foundation.URL, diagnosticEngine: DiagnosticsEngine? = nil) {
         self.registryBaseURL = registryBaseURL
-        client = Self.clientFactory()
+        self.client = Self.clientFactory(diagnosticEngine)
     }
 
     public class func discover(
         for package: PackageReference,
+        diagnosticsEngine: DiagnosticsEngine? = nil,
         on queue: DispatchQueue,
         completion: @escaping (Result<RegistryManager, Error>) -> Void
     ) {
@@ -71,15 +72,15 @@ public final class RegistryManager {
                     ]
                 )
 
-                let client = clientFactory()
+                let client = clientFactory(diagnosticsEngine)
 
                 let response = try tsc_await { client.execute(request, callback: $0) }
                 if response.statusCode == 303,
                    response.headers.get("Content-Version").first == "1",
                    let location = response.headers.get("Location").first,
                    let redirectedURL = URL(string: location, relativeTo: url)
                 {
-                    return RegistryManager(registryBaseURL: redirectedURL)
+                    return RegistryManager(registryBaseURL: redirectedURL, diagnosticEngine: diagnosticsEngine)
                 } else {
                     throw RegistryError.invalidResponse
                 }
@@ -199,7 +200,6 @@ public final class RegistryManager {
             ]
         )
 
-        let client = Self.clientFactory()
         client.execute(request) { result in
             switch result {
             case .success(let response):

Tests/PackageRegistryTests/RegistryManagerTests.swift

@@ -33,7 +33,7 @@ final class RegistryManagerTests: XCTestCase {
             return MockArchiver()
         }
 
-        RegistryManager.clientFactory = {
+        RegistryManager.clientFactory = { _ in
             let configuration = URLSessionConfiguration.default
             configuration.protocolClasses = [MockPackageRegistryURLProtocol.self] + (configuration.protocolClasses ?? [])
             return URLSessionHTTPClient(configuration: configuration)