Skip to content
Merged
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
16 changes: 11 additions & 5 deletions src/azure-cli-telemetry/azure/cli/telemetry/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ def _start(config_dir, cache_dir):


def save(config_dir, payload):
from azure.cli.telemetry.components.telemetry_client import CliTelemetryClient
from azure.cli.telemetry.components.telemetry_logging import get_logger

logger = get_logger('main')
Expand All @@ -59,14 +58,21 @@ def save(config_dir, payload):

logger.info('Begin splitting cli events and extra events, total events: %s', len(events))
cli_events = {}
client = CliTelemetryClient()
extra_events = {}
for key, event in events.items():
if key == DEFAULT_INSTRUMENTATION_KEY:
cli_events[key] = event
else:
extra_event = {key: event}
client.add(json.dumps(extra_event), flush=True)
client.flush(force=True)
extra_events[key] = event

if extra_events:
# Defer applicationinsights import to only when extra events exist
from azure.cli.telemetry.components.telemetry_client import CliTelemetryClient
client = CliTelemetryClient()
for key, event in extra_events.items():
client.add(json.dumps({key: event}), flush=True)
Comment on lines +72 to +73
client.flush(force=True)

cli_payload = json.dumps(cli_events) if cli_events else None
logger.info('Finish splitting cli events and extra events, cli events: %s', len(cli_events))
except Exception as ex: # pylint: disable=broad-except
Expand Down
Loading