convert to constant

Author: kai

.github/workflows/auto-retag.yml

@@ -5,9 +5,9 @@ name: Auto-retag UNTAGGED entries
 
 on:
   workflow_dispatch:  # Manual trigger
-  push:
+  pull_request:
     branches:
-      - '**'  # All branches
+      - dev  # Only for PRs targeting dev branch
     paths:
       - 'IdentityCore/src/telemetry/execution_flow/MSIDExecutionFlowConstants.m'
 

IdentityCore/src/telemetry/execution_flow/MSIDExecutionFlow.m

@@ -27,6 +27,7 @@
 #import "MSIDJsonSerializer.h"
 #import "NSDate+MSIDExtensions.h"
 #import "NSString+MSIDExtensions.h"
+#import "MSIDExecutionFlowConstants.h"
 
 #define MAX_EXECUTION_FLOW_SIZE 50
 
@@ -59,19 +60,19 @@ - (void)insertTag:(NSString *)tag
 {
     if ([NSString msidIsStringNilOrBlank:tag])
     {
-        MSID_LOG_WITH_CTX_PII(MSIDLogLevelWarning, nil, @"Tag cannot be nil", nil);
+        MSID_LOG_WITH_CTX_PII(MSIDLogLevelWarning, nil, MSID_EXECUTION_FLOW_TAG_NIL_MESSAGE, nil);
         return;
     }
 
     if (!tid)
     {
-        MSID_LOG_WITH_CTX_PII(MSIDLogLevelWarning, nil, @"tid cannot be nil", nil);
+        MSID_LOG_WITH_CTX_PII(MSIDLogLevelWarning, nil, MSID_EXECUTION_FLOW_TID_NIL_MESSAGE, nil);
         return;
     }
 
     if (!triggeringTime)
     {
-        MSID_LOG_WITH_CTX_PII(MSIDLogLevelWarning, nil, @"triggeringTime cannot be nil", nil);
+        MSID_LOG_WITH_CTX_PII(MSIDLogLevelWarning, nil, MSID_EXECUTION_FLOW_TRIGGERING_TIME_NIL_MESSAGE, nil);
         return;
     }
 
@@ -91,7 +92,7 @@ - (void)insertTag:(NSString *)tag
         MSIDExecutionFlowBlob *blob = [[MSIDExecutionFlowBlob alloc] initWithTag:tag timeStep:@(ts) threadId:tid];
         if (!blob)
         {
-            MSID_LOG_WITH_CTX_PII(MSIDLogLevelWarning, nil, @"Failed to create execution flow blob", nil);
+            MSID_LOG_WITH_CTX_PII(MSIDLogLevelWarning, nil, MSID_EXECUTION_FLOW_FAILED_TO_CREATE_BLOB_MESSAGE, nil);
             return;
         }
 
@@ -115,7 +116,7 @@ - (void)insertTag:(NSString *)tag
 - (NSString *)exportExecutionFlowToJSONsWithKeys:(NSSet<NSString *> *)queryKeys
 {
 
-    __block NSMutableString *jsonArray = [NSMutableString stringWithString:@"["];
+    __block NSMutableString *jsonArray = [NSMutableString stringWithString:MSID_EXECUTION_FLOW_JSON_OPEN_BRACKET];
 
     dispatch_sync(self.executionFlowWritingQueue, ^{
         for (NSUInteger i = 0; i < self.executionFlow.count; i++)
@@ -130,16 +131,16 @@ - (NSString *)exportExecutionFlowToJSONsWithKeys:(NSSet<NSString *> *)queryKeys
                 // Add comma separator if not the last element
                 if (i < self.executionFlow.count - 1)
                 {
-                    [jsonArray appendString:@","];
+                    [jsonArray appendString:MSID_EXECUTION_FLOW_JSON_COMMA];
                 }
             }
         }
     });
 
-    [jsonArray appendString:@"]"];
+    [jsonArray appendString:MSID_EXECUTION_FLOW_JSON_CLOSE_BRACKET];
 
     // Return nil if array is empty
-    if ([jsonArray isEqualToString:@"[]"])
+    if ([jsonArray isEqualToString:MSID_EXECUTION_FLOW_JSON_EMPTY_ARRAY])
     {
         return nil;
     }

IdentityCore/src/telemetry/execution_flow/MSIDExecutionFlowConstants.h

@@ -46,6 +46,17 @@ extern NSString * _Nonnull const MSID_EXECUTION_FLOW_THREAD_ID;
 extern NSString * _Nonnull const MSID_EXECUTION_FLOW_DIAGNOSTIC_ID;
 extern NSString * _Nonnull const MSID_EXECUTION_FLOW_ERROR_CODE;
 
+// Log messages
+FOUNDATION_EXPORT NSString * _Nonnull const MSID_EXECUTION_FLOW_TAG_NIL_MESSAGE;
+FOUNDATION_EXPORT NSString * _Nonnull const MSID_EXECUTION_FLOW_TID_NIL_MESSAGE;
+FOUNDATION_EXPORT NSString * _Nonnull const MSID_EXECUTION_FLOW_TRIGGERING_TIME_NIL_MESSAGE;
+FOUNDATION_EXPORT NSString * _Nonnull const MSID_EXECUTION_FLOW_FAILED_TO_CREATE_BLOB_MESSAGE;
+
+// JSON formatting constants
+FOUNDATION_EXPORT NSString * _Nonnull const MSID_EXECUTION_FLOW_JSON_OPEN_BRACKET;
+FOUNDATION_EXPORT NSString * _Nonnull const MSID_EXECUTION_FLOW_JSON_COMMA;
+FOUNDATION_EXPORT NSString * _Nonnull const MSID_EXECUTION_FLOW_JSON_CLOSE_BRACKET;
+FOUNDATION_EXPORT NSString * _Nonnull const MSID_EXECUTION_FLOW_JSON_EMPTY_ARRAY;
 /// A enum of MSIDExecutionFlowNetworkT@"e"ag.
 typedef NS_ENUM(NSInteger, MSIDExecutionFlowNetworkTag)
 {

IdentityCore/src/telemetry/execution_flow/MSIDExecutionFlowConstants.m

@@ -34,6 +34,17 @@
 
 NSString *const MSID_EXECUTION_FLOW_ERROR_CODE  = @"e";
 
+// Log messages
+NSString *const MSID_EXECUTION_FLOW_TAG_NIL_MESSAGE = @"Tag cannot be nil";
+NSString *const MSID_EXECUTION_FLOW_TID_NIL_MESSAGE = @"tid cannot be nil";
+NSString *const MSID_EXECUTION_FLOW_TRIGGERING_TIME_NIL_MESSAGE = @"triggeringTime cannot be nil";
+NSString *const MSID_EXECUTION_FLOW_FAILED_TO_CREATE_BLOB_MESSAGE = @"Failed to create execution flow blob";
+
+// JSON formatting constants
+NSString *const MSID_EXECUTION_FLOW_JSON_OPEN_BRACKET = @"[";
+NSString *const MSID_EXECUTION_FLOW_JSON_COMMA = @",";
+NSString *const MSID_EXECUTION_FLOW_JSON_CLOSE_BRACKET = @"]";
+NSString *const MSID_EXECUTION_FLOW_JSON_EMPTY_ARRAY = @"[]";
 
 NSString *MSIDExecutionFlowNetworkTagToString(MSIDExecutionFlowNetworkTag state)
 {