Use proper OSLog privacy levels

Author: rockbruno

Sources/SourceKitBazelBSP/RequestHandlers/BuildTargets/BazelTargetQuerier.swift

@@ -81,7 +81,7 @@ final class BazelTargetQuerier {
         let depsQuery = Self.queryDepsString(forTargets: config.targets)
         let cacheKey = "\(kindsFilter)+\(depsQuery)"
 
-        logger.info("Processing query request for \(cacheKey, privacy: .public)")
+        logger.info("Processing query request for \(cacheKey)")
 
         if let cached = queryCache[cacheKey] {
             logger.debug("Returning cached results")

Sources/SourceKitBazelBSP/RequestHandlers/BuildTargets/BuildTargetsHandler.swift

@@ -50,7 +50,7 @@ final class BuildTargetsHandler {
         )
         do {
             let result = try targetStore.fetchTargets()
-            logger.debug("Found \(result.count, privacy: .public) targets")
+            logger.debug("Found \(result.count) targets")
             connection?.finishTask(id: taskId, status: .ok)
             return WorkspaceBuildTargetsResponse(targets: result)
         } catch {

Sources/SourceKitBazelBSP/RequestHandlers/InitializeHandler.swift

@@ -88,15 +88,15 @@ final class InitializeHandler {
         baseConfig: BaseServerConfig,
     ) throws -> InitializedServerConfig {
         let rootUri = request.rootUri.arbitrarySchemeURL.path
-        logger.debug("rootUri: \(rootUri, privacy: .public)")
+        logger.debug("rootUri: \(rootUri)")
         let regularOutputBase = URL(
             fileURLWithPath: try commandRunner.bazel(
                 baseConfig: baseConfig,
                 rootUri: rootUri,
                 cmd: "info output_base"
             )
         )
-        logger.debug("regularOutputBase: \(regularOutputBase, privacy: .public)")
+        logger.debug("regularOutputBase: \(regularOutputBase)")
 
         // Setup the special output base path where we will run indexing commands from.
         let regularOutputBaseLastPath = regularOutputBase.lastPathComponent
@@ -105,7 +105,7 @@ final class InitializeHandler {
             .deletingLastPathComponent()
             .appendingPathComponent("\(regularOutputBaseLastPath)-sourcekit-bazel-bsp")
             .path
-        logger.debug("outputBase: \(outputBase, privacy: .public)")
+        logger.debug("outputBase: \(outputBase)")
 
         // Now, get the full output path based on the above output base.
         let outputPath = try commandRunner.bazelIndexAction(
@@ -114,16 +114,16 @@ final class InitializeHandler {
             cmd: "info output_path",
             rootUri: rootUri
         )
-        logger.debug("outputPath: \(outputPath, privacy: .public)")
+        logger.debug("outputPath: \(outputPath)")
 
         // Collecting the rest of the env's details
         let devDir = try commandRunner.run("xcode-select --print-path")
         let sdkRoot = try commandRunner.run("xcrun --sdk iphonesimulator --show-sdk-path")
         let toolchain = try getToolchainPath(with: commandRunner)
 
-        logger.debug("devDir: \(devDir, privacy: .public)")
-        logger.debug("sdkRoot: \(sdkRoot, privacy: .public)")
-        logger.debug("toolchain: \(toolchain, privacy: .public)")
+        logger.debug("devDir: \(devDir)")
+        logger.debug("sdkRoot: \(sdkRoot)")
+        logger.debug("toolchain: \(toolchain)")
 
         return InitializedServerConfig(
             baseConfig: baseConfig,

Sources/SourceKitBazelBSP/RequestHandlers/PrepareHandler.swift

@@ -77,7 +77,7 @@ final class PrepareHandler {
     func build(
         bazelLabels labelsToBuild: [String]
     ) throws {
-        logger.info("Will build \(labelsToBuild.count, privacy: .public) targets")
+        logger.info("Will build \(labelsToBuild.count) targets")
 
         // Build the provided targets, on our special output base and taking into account special index flags.
         _ = try commandRunner.bazelIndexAction(

Sources/SourceKitBazelBSP/RequestHandlers/SKOptions/SKOptionsHandler.swift

@@ -82,10 +82,10 @@ final class SKOptionsHandler {
         }
         let targetUri = request.target.uri
         logger.info(
-            "Getting SKOptions for \(targetUri.stringValue, privacy: .public), language: \(request.language, privacy: .public)"
+            "Getting SKOptions for \(targetUri.stringValue), language: \(request.language)"
         )
         let bazelTarget = try targetStore.bazelTargetLabel(forBSPURI: targetUri)
-        logger.info("Target is: \(bazelTarget, privacy: .public)")
+        logger.info("Target is: \(bazelTarget)")
         let args = try getCompilerArguments(
             bazelTarget,
             request.language,
@@ -121,10 +121,10 @@ final class SKOptionsHandler {
             contentToQuery = parsedFile
         }
         if let cachedArgs = queryCache[cacheKey] {
-            logger.info("Returning cached compiler arguments for \(cacheKey, privacy: .public)")
+            logger.info("Returning cached compiler arguments for \(cacheKey)")
             return cachedArgs
         }
-        logger.info("Getting compiler arguments for \(cacheKey, privacy: .public)")
+        logger.info("Getting compiler arguments for \(cacheKey)")
         let appToBuild = BazelTargetQuerier.queryDepsString(
             forTargets: initializedConfig.baseConfig.targets)
         var output: String
@@ -184,10 +184,10 @@ final class SKOptionsHandler {
         }
         if idx == -1 {
             logger.error(
-                "No module entry found in the aquery for \(contentToQuery, privacy: .public)")
+                "No module entry found in the aquery for \(contentToQuery)")
             return []
         }
-        logger.info("Found module for \(bazelTarget, privacy: .public) at \(idx, privacy: .public)")
+        logger.info("Found module for \(bazelTarget) at \(idx)")
         // now, get the first index of the line that starts with "Command Line: ("
         lines = Array(lines.dropFirst(idx + 1))
         idx = -1
@@ -205,7 +205,7 @@ final class SKOptionsHandler {
             logger.error("No command line entry found")
             return []
         }
-        logger.info("Found command line entry at \(idx, privacy: .public)")
+        logger.info("Found command line entry at \(idx)")
 
         // now, find where the arguments end
         lines = Array(lines.dropFirst(idx + 1))
@@ -222,7 +222,7 @@ final class SKOptionsHandler {
             return []
         }
 
-        logger.info("Found where the args end at \(idx, privacy: .public)")
+        logger.info("Found where the args end at \(idx)")
         lines = Array(lines.dropLast(lines.count - idx - 1))
 
         // the spaced lines are the compiler arguments

Sources/SourceKitBazelBSP/RequestHandlers/TargetSourcesHandler.swift

@@ -44,7 +44,7 @@ final class TargetSourcesHandler {
         _ id: RequestID
     ) throws -> BuildTargetSourcesResponse {
         let targets = request.targets
-        logger.info("Fetching sources for \(targets.count, privacy: .public) targets")
+        logger.info("Fetching sources for \(targets.count) targets")
 
         var srcs: [SourcesItem] = []
         for target in targets {
@@ -61,7 +61,7 @@ final class TargetSourcesHandler {
         let count = srcs.reduce(0) { $0 + $1.sources.count }
 
         logger.info(
-            "Returning \(srcs.count, privacy: .public) source specs (\(count, privacy: .public) total source entries)"
+            "Returning \(srcs.count) source specs (\(count) total source entries)"
         )
 
         return BuildTargetSourcesResponse(items: srcs)

Sources/SourceKitBazelBSP/Server/MessageHandler/BSPMessageHandler.swift

@@ -62,7 +62,7 @@ final class BSPMessageHandler: MessageHandler {
     func handle<Notification: NotificationType>(_ notification: Notification) {
         lock.withLockUnchecked {
             logger.info(
-                "Received notification: \(Notification.method, privacy: .public)"
+                "Received notification: \(Notification.method)"
             )
             do {
                 let handler = try getHandler(for: notification, state: state)
@@ -80,12 +80,12 @@ final class BSPMessageHandler: MessageHandler {
     ) {
         lock.withLockUnchecked {
             logger.info(
-                "Received request: \(Request.method, privacy: .public)"
+                "Received request: \(Request.method)"
             )
             do {
                 let handler = try getHandler(for: request, id, reply, state: state)
                 let response = try handler(request, id)
-                logger.info("Replying to \(Request.method, privacy: .public)")
+                logger.info("Replying to \(Request.method)")
                 reply(.success(response))
             } catch {
                 logger.error("Error while handling BSP request: \(error.localizedDescription)")

Sources/SourceKitBazelBSP/SharedUtils/Shell/ShellCommandRunner.swift

@@ -48,7 +48,7 @@ struct ShellCommandRunner: CommandRunner {
         task.arguments = ["-c", cmd]
         task.standardInput = nil
 
-        logger.info("Running shell: \(cmd, privacy: .public)")
+        logger.info("Running shell: \(cmd)")
         try task.run()
 
         // Drain stdout/err first to avoid deadlocking when the output is buffered.

Sources/SourceKitBazelBSP/SharedUtils/SplitLogMessage.swift

@@ -61,8 +61,8 @@ extension Logger {
             self.log(
                 level: level,
                 """
-                \(header, privacy: .public) (\(i + 1)/\(maxChunkCount))
-                \(loggableChunk, privacy: .public)
+                \(header) (\(i + 1)/\(maxChunkCount))
+                \(loggableChunk)
                 """
             )
         }