Address feedbacks

Author: cherylEnkidu

Sources/DataConnect.swift

@@ -19,8 +19,6 @@ import FirebaseAuth
 import FirebaseCore
 import OSLog
 
-let kFIRPrivateLogDisabledArgument = "-FIRPrivateLogDisabled"
-
 @available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
 public class DataConnect {
   private var connectorConfig: ConnectorConfig
@@ -39,10 +37,6 @@ public class DataConnect {
     public static let port = 9399
   }
 
-  class ArgumentFlag {
-    static var privateLoggingEnabled = true
-  }
-
   // MARK: Static Creation
 
   /// Returns an instance of DataConnect matching the parameters.
@@ -113,18 +107,6 @@ public class DataConnect {
       callerSDKType: self.callerSDKType
     )
     operationsManager = OperationsManager(grpcClient: grpcClient)
-
-    LoadArguments()
-  }
-
-  private func LoadArguments() {
-    let arguments = ProcessInfo.processInfo.arguments
-    if arguments.contains(kFIRPrivateLogDisabledArgument) {
-      ArgumentFlag.privateLoggingEnabled = false
-      DataConnectLogger.debug("DataConnect private logging disabled.")
-    } else {
-      DataConnectLogger.debug("DataConnect private logging enabled.")
-    }
   }
 
   // MARK: Operations

Sources/Internal/GrpcClient.swift

@@ -245,7 +245,7 @@ actor GrpcClient: CustomStringConvertible {
 
     // Enable GRPC tracing
     if DataConnectLogger.logLevel.rawValue >= FirebaseLoggerLevel.debug.rawValue,
-       DataConnect.ArgumentFlag.privateLoggingEnabled == false {
+       DataConnectLogger.privateLoggingEnabled == false {
       var logger = Logger(label: "com.google.firebase.dataconnect.grpc")
       logger.logLevel = .trace
       options.logger = logger

Sources/Internal/Logger/DataConnectLogger.swift

@@ -15,13 +15,26 @@
 import FirebaseCore
 import OSLog
 
+let privateLogDisabledArgument = "-FIRPrivateLogDisabled"
+
 @available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
 class DataConnectLogger {
-  private static let logger = Logger(
+  static let logger = Logger(
     subsystem: "com.google.firebase",
     category: "[FirebaseDataConnect]"
   )
 
+  static let privateLoggingEnabled: Bool = {
+    let arguments = ProcessInfo.processInfo.arguments
+    if arguments.contains(privateLogDisabledArgument) {
+      DataConnectLogger.debug("DataConnect private logging disabled.")
+      return false
+    } else {
+      DataConnectLogger.debug("DataConnect private logging enabled.")
+      return true
+    }
+  }()
+
   private static let logPrefix = "\(Version.sdkVersion) - [FirebaseDataConnect]"
 
   static var logLevel: FirebaseLoggerLevel {
@@ -64,16 +77,15 @@ class DataConnectLogger {
   }
 }
 
-enum LogPrivacy: Int {
-  case `public` = 0
-
-  case `private` = 1
+enum LogPrivacy {
+  case `public`
+  case `private`
 }
 
 @available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
 extension DefaultStringInterpolation {
   mutating func appendInterpolation(_ value: String, privacy: LogPrivacy = .public) {
-    if privacy == .private, DataConnect.ArgumentFlag.privateLoggingEnabled {
+    if privacy == .private, DataConnectLogger.privateLoggingEnabled {
       appendLiteral(" <private>")
     } else {
       appendLiteral(value)