Revert "remove correlation ids in Chat and UserAction"

This reverts commit b383900.

Author: NoriZC

shell/agents/Microsoft.Azure.Agent/AzureAgent.cs

@@ -124,31 +124,21 @@ public void Initialize(AgentConfig config)
     public void OnUserAction(UserActionPayload actionPayload) {
         // Send telemetry about the user action.
         bool isUserFeedback = false;
-        bool allowIdsForCorrelation = false;
         string details = null;
         UserAction action = actionPayload.Action;
 
         if (action is UserAction.Dislike)
         {
-            isUserFeedback = true;
-            DislikePayload dislikePayload = (DislikePayload)actionPayload;
-            allowIdsForCorrelation = dislikePayload.ShareConversation;
             var dislike = (DislikePayload) actionPayload;
+            isUserFeedback = true;
             details = string.Format("{0} | {1}", dislike.ShortFeedback, dislike.LongFeedback);
         }
         else if (action is UserAction.Like)
         {
             isUserFeedback = true;
         }
 
-        if (isUserFeedback)
-        {
-            Telemetry.Trace(AzTrace.Feedback(action.ToString(), _copilotResponse, details, allowIdsForCorrelation));
-        }
-        else
-        {
-            Telemetry.Trace(AzTrace.UserAction(action.ToString(), _copilotResponse, details));
-        }
+        Telemetry.Trace(AzTrace.UserAction(action.ToString(), _copilotResponse, details, isUserFeedback));
     }
 
     public async Task RefreshChatAsync(IShell shell, bool force)

shell/agents/Microsoft.Azure.Agent/Telemetry.cs

@@ -76,40 +76,20 @@ internal static void Initialize()
     internal object Details { get; set; }
 
     internal static AzTrace UserAction(
-        string shellCommand,
-        CopilotResponse response,
-        object details)
-    {
-        if (Telemetry.Enabled)
-        {
-            return new()
-            {
-                TopicName = response.TopicName,
-                ShellCommand = shellCommand,
-                EventType = "UserAction",
-                Details = details
-            };
-        }
-
-        // Don't create an object when telemetry is disabled.
-        return null;
-    }
-
-    internal static AzTrace Feedback(
         string shellCommand,
         CopilotResponse response,
         object details,
-        bool allowIdsForCorrelation)
+        bool isFeedback = false)
     {
         if (Telemetry.Enabled)
         {
             return new()
             {
-                QueryId = allowIdsForCorrelation ? response.ReplyToId : null,
+                QueryId = response.ReplyToId,
                 TopicName = response.TopicName,
-                ConversationId = allowIdsForCorrelation ? response.ConversationId : null,
+                ConversationId = response.ConversationId,
                 ShellCommand = shellCommand,
-                EventType = "Feedback",
+                EventType = isFeedback ? "Feedback" : "UserAction",
                 Details = details
             };
         }
@@ -125,7 +105,9 @@ internal static AzTrace Chat(CopilotResponse response)
             return new()
             {
                 EventType = "Chat",
-                TopicName = response.TopicName
+                QueryId = response.ReplyToId,
+                TopicName = response.TopicName,
+                ConversationId = response.ConversationId
             };
         }