Remove queue scan spam from logs

avito-tech · Apr 15, 2022 · 59ff1af · 59ff1af
1 parent 6d2722a
commit 59ff1af
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 21 deletions.
diff --git a/Package.resolved b/Package.resolved
@@ -19,6 +19,15 @@
           "version": "1.0.46"
         }
       },
+      {
+        "package": "CommandLineToolkit",
+        "repositoryURL": "https://github.com/avito-tech/CommandLineToolkit.git",
+        "state": {
+          "branch": null,
+          "revision": "16612e46a7e6af9678d37a851a65500c533da65e",
+          "version": "1.0.10"
+        }
+      },
       {
         "package": "CountedSet",
         "repositoryURL": "https://github.com/0x7fs/CountedSet",
@@ -37,15 +46,6 @@
           "version": "1.0.5"
         }
       },
-      {
-        "package": "CommandLineToolkit",
-        "repositoryURL": "https://github.com/avito-tech/CommandLineToolkit.git",
-        "state": {
-          "branch": null,
-          "revision": "16612e46a7e6af9678d37a851a65500c533da65e",
-          "version": "1.0.10"
-        }
-      },
       {
         "package": "OrderedSet",
         "repositoryURL": "https://github.com/Weebly/OrderedSet",

diff --git a/Sources/QueueClient/Clients/QueueServerVersionFetcher/QueueServerVersionFetcherImpl.swift b/Sources/QueueClient/Clients/QueueServerVersionFetcher/QueueServerVersionFetcherImpl.swift
@@ -19,6 +19,7 @@ public final class QueueServerVersionFetcherImpl: QueueServerVersionFetcher {
         requestSender.sendRequestWithCallback(
             request: QueueVersionRequest(),
             callbackQueue: callbackQueue,
+            logFailedRequest: false,
             callback: { (result: Either<QueueVersionResponse, RequestSenderError>) in
                 completion(
                     result.mapResult {

diff --git a/Sources/RequestSender/RequestSender.swift b/Sources/RequestSender/RequestSender.swift
@@ -8,12 +8,7 @@ public protocol RequestSender {
         request: NetworkRequestType,
         credentials: Credentials?,
         callbackQueue: DispatchQueue,
-        callback: @escaping (Either<NetworkRequestType.Response, RequestSenderError>) -> ()
-    )
-
-    func sendRequestWithCallback<NetworkRequestType: NetworkRequest>(
-        request: NetworkRequestType,
-        callbackQueue: DispatchQueue,
+        logFailedRequest: Bool,
         callback: @escaping (Either<NetworkRequestType.Response, RequestSenderError>) -> ()
     )
 
@@ -24,12 +19,14 @@ extension RequestSender {
     public func sendRequestWithCallback<NetworkRequestType: NetworkRequest>(
         request: NetworkRequestType,
         callbackQueue: DispatchQueue,
+        logFailedRequest: Bool = true,
         callback: @escaping (Either<NetworkRequestType.Response, RequestSenderError>) -> ()
     ) {
         self.sendRequestWithCallback(
             request: request,
             credentials: nil,
             callbackQueue: callbackQueue,
+            logFailedRequest: logFailedRequest,
             callback: callback
         )
     }

diff --git a/Sources/RequestSender/RequestSenderImpl.swift b/Sources/RequestSender/RequestSenderImpl.swift
@@ -30,13 +30,15 @@ public final class RequestSenderImpl: RequestSender {
         request: NetworkRequestType,
         credentials: Credentials?,
         callbackQueue: DispatchQueue,
+        logFailedRequest: Bool,
         callback: @escaping (Either<NetworkRequestType.Response, RequestSenderError>) -> ()
     ) {
         do {
             try sendRequest(
                 request: request,
                 credentials: credentials,
                 callbackQueue: callbackQueue,
+                logFailedRequest: logFailedRequest,
                 callback: callback
             )
         } catch {
@@ -50,6 +52,7 @@ public final class RequestSenderImpl: RequestSender {
         request: NetworkRequestType,
         credentials: Credentials?,
         callbackQueue: DispatchQueue,
+        logFailedRequest: Bool,
         callback: @escaping (Either<NetworkRequestType.Response, RequestSenderError>) -> ()
     ) throws {
         let url = try createUrl(pathWithSlash: request.pathWithLeadingSlash)
@@ -58,9 +61,9 @@ public final class RequestSenderImpl: RequestSender {
         guard !isClosed else {
             throw RequestSenderError.sessionIsClosed(url)
         }
-
+        
         var urlRequest = URLRequest(url: url, cachePolicy: .reloadIgnoringLocalCacheData, timeoutInterval: .infinity)
-        urlRequest.addValue("Content-Type", forHTTPHeaderField: "application/json")
+        urlRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
         urlRequest.httpMethod = request.httpMethod.value
         urlRequest.httpBody = try buildHttpBody(payload: request.payload)
         urlRequest.timeoutInterval = request.timeout
@@ -70,7 +73,7 @@ public final class RequestSenderImpl: RequestSender {
             urlRequest.setValue("Basic \(loginString)", forHTTPHeaderField: "Authorization")
         }
 
-        launchDataTask(url: url, urlRequest: urlRequest, callbackQueue: callbackQueue, callback: callback)
+        launchDataTask(url: url, urlRequest: urlRequest, callbackQueue: callbackQueue, logFailedRequest: logFailedRequest, callback: callback)
     }
 
     private func buildHttpBody<PayloadType: Encodable>(payload: PayloadType?) throws -> Data? {
@@ -82,13 +85,16 @@ public final class RequestSenderImpl: RequestSender {
         url: URL,
         urlRequest: URLRequest,
         callbackQueue: DispatchQueue,
+        logFailedRequest: Bool,
         callback: @escaping (Either<ResponseType, RequestSenderError>) -> ()
     ) {
         let logger = self.logger.withMetadata(key: "url", value: url.absoluteString)
 
         let dataTask = urlSession.dataTask(with: urlRequest) { (data: Data?, response: URLResponse?, error: Error?) in
             if let error = error {
-                logger.error("Failed to perform request to \(url): \(error)")
+                if logFailedRequest {
+                    logger.error("Failed to perform request to \(url): \(error)")
+                }
                 callbackQueue.async { callback(.error(.communicationError(error))) }
                 return
             }

diff --git a/Sources/TestDiscovery/RuntimeDumpRemoteCache/DefaultRuntimeDumpRemoteCache.swift b/Sources/TestDiscovery/RuntimeDumpRemoteCache/DefaultRuntimeDumpRemoteCache.swift
@@ -38,7 +38,8 @@ class DefaultRuntimeDumpRemoteCache: RuntimeDumpRemoteCache {
         sender.sendRequestWithCallback(
             request: request,
             credentials: config.credentials,
-            callbackQueue: callbackQueue
+            callbackQueue: callbackQueue,
+            logFailedRequest: false
         ) { result in
             callbackWaiter.set(result: result)
         }
@@ -58,7 +59,8 @@ class DefaultRuntimeDumpRemoteCache: RuntimeDumpRemoteCache {
         sender.sendRequestWithCallback(
             request: request,
             credentials: config.credentials,
-            callbackQueue: callbackQueue
+            callbackQueue: callbackQueue,
+            logFailedRequest: false
         ) { (result: Either<VoidPayload, RequestSenderError>) in
             callbackWaiter.set(result: result.right)
         }

diff --git a/Tests/RequestSenderTestHelpers/FakeRequestSender.swift b/Tests/RequestSenderTestHelpers/FakeRequestSender.swift
@@ -31,6 +31,7 @@ open class FakeRequestSender: RequestSender {
         request: NetworkRequestType,
         credentials: Credentials?,
         callbackQueue: DispatchQueue,
+        logFailedRequest: Bool,
         callback: @escaping (Either<NetworkRequestType.Response, RequestSenderError>) -> ()
     ) {
         self.request = request

diff --git a/Tests/RequestSenderTests/RequestSenderTests.swift b/Tests/RequestSenderTests/RequestSenderTests.swift
@@ -94,6 +94,7 @@ final class RequestSenderTests: XCTestCase {
             request: FakeNetworkRequest(),
             credentials: credentials,
             callbackQueue: callbackQueue,
+            logFailedRequest: false,
             callback: { _ in }
         )
         wait(for: [requestSent], timeout: 10)
@@ -116,6 +117,7 @@ final class RequestSenderTests: XCTestCase {
             request: FakeNetworkRequest(),
             credentials: nil,
             callbackQueue: callbackQueue,
+            logFailedRequest: false,
             callback: { _ in }
         )
         wait(for: [requestSent], timeout: 10)