minor fix

Author: wangzelin007

src/azure-cli-core/azure/cli/core/commands/__init__.py

@@ -719,6 +719,7 @@ def _what_if(self, args):
             if not self._is_command_supported_for_what_if(args):
                 error_msg = ("\"--what-if\" argument is not supported for this command.")
                 logger.error(error_msg)
+                telemetry.set_what_if_summary('what-if-unsupported-command')
                 telemetry.set_user_fault(summary='what-if-unsupported-command')
                 return CommandResultItem(None, exit_code=1, error=CLIError(error_msg))
 
@@ -765,6 +766,7 @@ def _what_if(self, args):
                 if 'output' not in self.cli_ctx.invocation.data or self.cli_ctx.invocation.data['output'] is None:
                     self.cli_ctx.invocation.data['output'] = 'json'
 
+                telemetry.set_what_if_summary('what-if-completed')
                 telemetry.set_success(summary='what-if-completed')
 
                 # Return the formatted what-if output as the result
@@ -778,6 +780,8 @@ def _what_if(self, args):
             except (CLIError, ValueError, KeyError) as ex:
                 # If what-if service fails, still show an informative message
                 logger.error("What-if preview failed: %s", str(ex))
+                telemetry.set_what_if_summary('what-if-failed')
+                telemetry.set_what_if_exception(ex)
                 telemetry.set_exception(ex, fault_type='what-if-error')
                 telemetry.set_failure(summary='what-if-failed')
                 return CommandResultItem(None, exit_code=1,

src/azure-cli-core/azure/cli/core/telemetry.py

@@ -78,6 +78,9 @@ def __init__(self, correlation_id=None, application=None):
         self.enable_broker_on_windows = None
         self.msal_telemetry = None
         self.login_experience_v2 = None
+        # what-if specific telemetry
+        self.what_if_summary = None
+        self.what_if_exception = None
 
     def add_event(self, name, properties):
         for key in self.instrumentation_key:
@@ -234,6 +237,9 @@ def _get_azure_cli_properties(self):
         set_custom_properties(result, 'EnableBrokerOnWindows', str(self.enable_broker_on_windows))
         set_custom_properties(result, 'MsalTelemetry', self.msal_telemetry)
         set_custom_properties(result, 'LoginExperienceV2', str(self.login_experience_v2))
+        # what-if related
+        set_custom_properties(result, 'WhatIfSummary', self.what_if_summary)
+        set_custom_properties(result, 'WhatIfException', self.what_if_exception)
 
         return result
 
@@ -486,6 +492,18 @@ def set_msal_telemetry(msal_telemetry):
 @decorators.suppress_all_exceptions()
 def set_login_experience_v2(login_experience_v2):
     _session.login_experience_v2 = login_experience_v2
+
+
+@decorators.suppress_all_exceptions()
+def set_what_if_summary(summary):
+    _session.what_if_summary = summary
+
+
+@decorators.suppress_all_exceptions()
+def set_what_if_exception(exception):
+    # Store exception type and message, limit length to avoid huge payloads
+    exception_info = f"{exception.__class__.__name__}: {str(exception)[:512]}"
+    _session.what_if_exception = exception_info
 # endregion
 
 

src/azure-cli-telemetry/azure/cli/telemetry/__init__.py

@@ -58,6 +58,7 @@ def save(config_dir, payload):
         events = json.loads(payload)
 
         logger.info('Begin splitting cli events and extra events, total events: %s', len(events))
+        logger.debug('events: %s', events)
         cli_events = {}
         client = CliTelemetryClient()
         for key, event in events.items():