From ed612a53bc2d0c76e12f764e67bdbd0cfd7f5326 Mon Sep 17 00:00:00 2001
From: Andrew Heard <andrewheard@google.com>
Date: Wed, 10 Jul 2024 19:24:27 -0400
Subject: [PATCH] Replace `GULLoggerService` with `NSString *`

---
 GoogleUtilities/Logger/GULLogger.m             | 18 +++++++++---------
 .../Logger/Public/GoogleUtilities/GULLogger.h  |  6 ++++--
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/GoogleUtilities/Logger/GULLogger.m b/GoogleUtilities/Logger/GULLogger.m
index 8eff1bf..8a1c2be 100644
--- a/GoogleUtilities/Logger/GULLogger.m
+++ b/GoogleUtilities/Logger/GULLogger.m
@@ -139,7 +139,7 @@ os_log_type_t GULLoggerLevelToOSLogType(GULLoggerLevel level) {
 
 void GULOSLogBasic(GULLoggerLevel level,
                    NSString *subsystem,
-                   GULLoggerService category,
+                   NSString *category,
                    BOOL forceLog,
                    NSString *messageCode,
                    NSString *message,
@@ -222,14 +222,14 @@ void GULLogBasic(GULLoggerLevel level,
  * Calling GULLogDebug({service}, @"I-XYZ000001", @"Configure succeed.") shows:
  * yyyy-mm-dd hh:mm:ss.SSS sender[PID] <Debug> [{service}][I-XYZ000001] Configure succeed.
  */
-#define GUL_LOGGING_FUNCTION(level)                                                        \
-  void GULOSLog##level(NSString *subsystem, GULLoggerService category, BOOL force,         \
-                       NSString *messageCode, NSString *message, ...) {                    \
-    va_list args_ptr;                                                                      \
-    va_start(args_ptr, message);                                                           \
-    GULOSLogBasic(GULLoggerLevel##level, subsystem, category, force, messageCode, message, \
-                  args_ptr);                                                               \
-    va_end(args_ptr);                                                                      \
+#define GUL_LOGGING_FUNCTION(level)                                                                \
+  void GULOSLog##level(NSString *subsystem, NSString *category, BOOL force, NSString *messageCode, \
+                       NSString *message, ...) {                                                   \
+    va_list args_ptr;                                                                              \
+    va_start(args_ptr, message);                                                                   \
+    GULOSLogBasic(GULLoggerLevel##level, subsystem, category, force, messageCode, message,         \
+                  args_ptr);                                                                       \
+    va_end(args_ptr);                                                                              \
   }
 
 GUL_LOGGING_FUNCTION(Error)
diff --git a/GoogleUtilities/Logger/Public/GoogleUtilities/GULLogger.h b/GoogleUtilities/Logger/Public/GoogleUtilities/GULLogger.h
index 7f0bb05..f4813ce 100644
--- a/GoogleUtilities/Logger/Public/GoogleUtilities/GULLogger.h
+++ b/GoogleUtilities/Logger/Public/GoogleUtilities/GULLogger.h
@@ -22,6 +22,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 /**
  * The services used in the logger.
+ *
+ * DEPRECATED; use NSString instead.
  */
 typedef NSString *const GULLoggerService;
 
@@ -87,7 +89,7 @@ extern void GULLoggerRegisterVersion(NSString *version);
  */
 extern void GULOSLogBasic(GULLoggerLevel level,
                           NSString *subsystem,
-                          GULLoggerService category,
+                          NSString *category,
                           BOOL forceLog,
                           NSString *messageCode,
                           NSString *message,
@@ -225,7 +227,7 @@ extern void GULOSLogDebug(NSString *subsystem,
 ///     a format string; optional if `message` is not a format string.
 + (void)logWithLevel:(GULLoggerLevel)level
            subsystem:(NSString *)subsystem
-            category:(GULLoggerService)category
+            category:(NSString *)category
          messageCode:(NSString *)messageCode
              message:(NSString *)message
            arguments:(va_list)args;