Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/azure-cli-core/azure/cli/core/commands/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -952,8 +952,10 @@ def __call__(self, poller):

cli_logger = get_logger() # get CLI logger which has the level set through command lines
is_verbose = any(handler.level <= logs.INFO for handler in cli_logger.handlers)

telemetry.poll_start()
poll_flag = False
while not poller.done():
poll_flag = True
self.cli_ctx.get_progress_controller().add(message='Running')
try:
# pylint: disable=protected-access
Expand Down Expand Up @@ -986,7 +988,8 @@ def __call__(self, poller):
handle_long_running_operation_exception(client_exception)

self.cli_ctx.get_progress_controller().end()

if poll_flag:
telemetry.poll_end()
return result


Expand Down
14 changes: 14 additions & 0 deletions src/azure-cli-core/azure/cli/core/telemetry.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ def __init__(self, correlation_id=None, application=None):
# stops generate_payload() from adding new azurecli/command event
# used for interactive to send new custom event upon exit
self.suppress_new_event = False
self.poll_start_time = None
self.poll_end_time = None

def add_exception(self, exception, fault_type, description=None, message=''):
# Move the exception info into userTask record, in order to make one Telemetry record for one command
Expand Down Expand Up @@ -196,6 +198,8 @@ def _get_azure_cli_properties(self):
set_custom_properties(result, 'error_type', self.error_type)
set_custom_properties(result, 'exception_name', self.exception_name)
set_custom_properties(result, 'debug_info', ','.join(self.debug_info))
set_custom_properties(result, 'PollStartTime', str(self.poll_start_time))
set_custom_properties(result, 'PollEndTime', str(self.poll_end_time))

return result

Expand Down Expand Up @@ -258,6 +262,16 @@ def set_invoke_time_elapsed(invoke_time_elapsed):
_session.invoke_time_elapsed = invoke_time_elapsed


@decorators.suppress_all_exceptions()
def poll_start():
_session.poll_start_time = datetime.datetime.utcnow()


@decorators.suppress_all_exceptions()
def poll_end():
_session.poll_end_time = datetime.datetime.utcnow()


@_user_agrees_to_telemetry
@decorators.suppress_all_exceptions()
def flush():
Expand Down