keep user feedback and model in telemetry

Author: mainred

src/aks-agent/azext_aks_agent/_consts.py

@@ -15,7 +15,7 @@
     "diagnostic data, to help improve Microsoft products and services. Processing of feedback data is governed by "
     "the Microsoft Products and Services Data Protection Addendum between your organization and Microsoft, and the "
     "feedback you submit is considered Personal Data under that addendum. "
-    "[link=https://go.microsoft.com/fwlink/?LinkId=521839]Privacy Statement[/link]"
+    "Privacy Statement: https://go.microsoft.com/fwlink/?LinkId=521839"
 )
 # Holmesgpt leverages prometheus_api_client for prometheus toolsets and introduces bz2 library.
 # Before libbz2-dev is bundled into azure cli python by https://github.com/Azure/azure-cli/pull/32163,

src/aks-agent/azext_aks_agent/agent/telemetry.py

@@ -82,12 +82,18 @@ def _get_application_insights_instrumentation_key(self) -> str:
 
     def track_agent_feedback(self, feedback):
         # NOTE: We should try to avoid importing holmesgpt at the top level to prevent dependency issues
-        from holmes.core.feedback import Feedback
+        from holmes.core.feedback import Feedback, FeedbackMetadata
 
         # Type hint validation for development purposes
         if not isinstance(feedback, Feedback):
             raise TypeError(f"Expected Feedback object, got {type(feedback)}")
 
-        self.track("AgentCLIFeedback", properties={"feedback": json.dumps(feedback.to_dict())})
+        # Before privacy team's approval for other user data, we keep only direct user feedback, and model info.
+        feedback_filtered = Feedback()
+        feedback_filtered.user_feedback = feedback.user_feedback
+        feedback_metadata = FeedbackMetadata()
+        feedback_metadata.model = feedback.metadata.model
+        feedback_filtered.metadata = feedback_metadata
+        self.track("AgentCLIFeedback", properties={"feedback": json.dumps(feedback_filtered.to_dict())})
         # Flush the telemetry data immediately to avoid too much data being sent at once
         self.flush()